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

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.0.7-SNAPSHOT development[skip ci]
by Tony CHEMIT 06 May '19

06 May '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 89f1244e by tchemit at 2019-05-06T12:03:13Z [jgitflow-maven-plugin]updating poms for 7.0.7-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.6-SNAPSHOT</version> + <version>7.0.7-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.6-SNAPSHOT</version> + <version>7.0.7-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.6-SNAPSHOT</version> + <version>7.0.7-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.6-SNAPSHOT</version> + <version>7.0.7-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.6-SNAPSHOT</version> + <version>7.0.7-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.6-SNAPSHOT</version> + <version>7.0.7-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.6-SNAPSHOT</version> + <version>7.0.7-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.6-SNAPSHOT</version> + <version>7.0.7-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.6-SNAPSHOT</version> + <version>7.0.7-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.6-SNAPSHOT</version> + <version>7.0.7-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.6-SNAPSHOT</version> + <version>7.0.7-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.6-SNAPSHOT</version> + <version>7.0.7-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.6-SNAPSHOT</version> + <version>7.0.7-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.6-SNAPSHOT</version> + <version>7.0.7-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.6-SNAPSHOT</version> + <version>7.0.7-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.6-SNAPSHOT</version> + <version>7.0.7-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/89f1244e90825251992e31a596c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/89f1244e90825251992e31a596c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.0.6
by Tony CHEMIT 06 May '19

06 May '19

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

1 0

[Git][ultreiaio/ird-observe][develop-7.x] add a way to deploy yo central
by Tony CHEMIT 06 May '19

06 May '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 30c8e83d by tchemit at 2019-05-06T12:02:28Z add a way to deploy yo central - - - - - 1 changed file: - observe/pom.xml Changes: ===================================== observe/pom.xml ===================================== @@ -142,4 +142,20 @@ </plugins> </build> + + <profiles> + <profile> + <id>deploy-to-central</id> + <activation> + <property> + <name>deploy.to.central</name> + <value>true</value> + </property> + </activation> + <properties> +  + <maven.deploy.skip>false</maven.deploy.skip> + </properties> + </profile> + </profiles> </project> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/30c8e83d59983f1336893a37802… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/30c8e83d59983f1336893a37802… You're receiving this email because of your account on gitlab.com.

1 0

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

06 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4e6d2f2c by tchemit at 2019-05-06T11:51:32Z update changelog - - - - - 9 changed files: - .mvn/gitlab-cache/milestones/674086-issues.json - .mvn/gitlab-cache/milestones/796341-artifacts.json - + .mvn/gitlab-cache/milestones/845406-issues.json - + .mvn/gitlab-cache/milestones/845406.json - + .mvn/gitlab-cache/milestones/845431-issues.json - + .mvn/gitlab-cache/milestones/845431.json - + .mvn/gitlab-cache/milestones/866537-issues.json - + .mvn/gitlab-cache/milestones/866537.json - CHANGELOG.md Changes: ===================================== .mvn/gitlab-cache/milestones/674086-issues.json ===================================== @@ -1,126 +1,4 @@ [ - { - "id": 18519374, - "iid": 1238, - "projectId": 2722779, - "title": "Nouveau logo", - "description": "Mettre à jour le logo de l\u0027application avec :\n\n![logo_obs7_cmyk_vector_sans_texte_300dpi](/uploads/5900a2a96b18c4c7b52c519fdcd297c6/logo_obs7_cmyk_vector_sans_texte_300dpi.png) ou ![logo_obs7_rvb_300dpi_objectif](/uploads/dccceead7600a5f5a67e29dc23d61a5d/logo_obs7_rvb_300dpi_objectif.png)\n\nLe premier est plus détaillé mais rendra peut-être mal avec les petites résolutions des icônes. A tester.", - "labels": [ - "Bas", - "Evolution", - "À 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" - }, - "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": 1, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "opened", - "updatedAt": "Feb 25, 2019 2:09:59 PM", - "createdAt": "Feb 22, 2019 4:35:02 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1238" - }, - { - "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": 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" - }, - "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": 1, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "opened", - "updatedAt": "Feb 25, 2019 2:10:22 PM", - "createdAt": "Feb 22, 2019 4:32:32 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1237" - }, { "id": 18573039, "iid": 1239, @@ -740,21 +618,21 @@ }, "assignees": [ { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", "_state": "active", "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" } ], "assignee": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", "_state": "active", "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, "author": { "_id": 166231, @@ -764,7 +642,7 @@ "_external": false, "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" }, - "userNotesCount": 4, + "userNotesCount": 5, "upVotes": 0, "downVotes": 0, "confidential": false, @@ -773,7 +651,7 @@ "totalTimeSpent": 0 }, "state": "opened", - "updatedAt": "Jan 27, 2019 7:48:51 AM", + "updatedAt": "Apr 16, 2019 1:44:48 AM", "createdAt": "Mar 27, 2018 3:49:17 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/918" }, ===================================== .mvn/gitlab-cache/milestones/796341-artifacts.json ===================================== @@ -1,12 +1,12 @@ [ { "name": "Application", - "filename": "observe-7.0.6-SNAPSHOT.zip", - "url": "https://ultreia.io/release/observe-7.0.6-SNAPSHOT.zip" + "filename": "observe-7.0.6.zip", + "url": "http://repo1.maven.org/maven2/fr/ird/observe/observe/7.0.6/observe-7.0.6.zip" }, { "name": "Serveur", - "filename": "observe-7.0.6-SNAPSHOT.war", - "url": "https://ultreia.io/release/observe-7.0.6-SNAPSHOT.war" + "filename": "observe-7.0.6.war", + "url": "http://repo1.maven.org/maven2/fr/ird/observe/observe/7.0.6/observe-7.0.6.war" } ] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/845406-issues.json ===================================== @@ -0,0 +1 @@ +[] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/845406.json ===================================== @@ -0,0 +1,10 @@ +{ + "id": 845406, + "iid": 138, + "projectId": 2722779, + "groupId": 0, + "title": "9.0", + "description": "", + "startDate": "Apr 11, 2019 2:00:00 AM", + "state": "active" +} \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/845431-issues.json ===================================== @@ -0,0 +1,1288 @@ +[ + { + "id": 19964498, + "iid": 1265, + "projectId": 2722779, + "title": "Rapports sur les données logbook et associées LL", + "description": "Voir CCTP 10", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 8" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 2:09:53 PM", + "createdAt": "Apr 11, 2019 2:09:53 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1265" + }, + { + "id": 19964442, + "iid": 1264, + "projectId": 2722779, + "title": "Gestion des données VMS", + "description": "Voir CCTP 11", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 9" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 2:08:17 PM", + "createdAt": "Apr 11, 2019 2:08:17 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1264" + }, + { + "id": 19964434, + "iid": 1263, + "projectId": 2722779, + "title": "Rapports sur les données logbook et associées PS", + "description": "Voir CCTP 9", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 7" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 2:07:35 PM", + "createdAt": "Apr 11, 2019 2:07:35 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1263" + }, + { + "id": 19964414, + "iid": 1262, + "projectId": 2722779, + "title": "Insertion du suivi du marché local", + "description": "Voir CCTP 8", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 6" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 2:06:53 PM", + "createdAt": "Apr 11, 2019 2:06:53 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1262" + }, + { + "id": 19964394, + "iid": 1261, + "projectId": 2722779, + "title": "Insertion de l’échantillonnage au port", + "description": "Voir CCTP 7", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 5" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 2:06:19 PM", + "createdAt": "Apr 11, 2019 2:06:19 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1261" + }, + { + "id": 19964349, + "iid": 1260, + "projectId": 2722779, + "title": "Insertion du plan de cuves", + "description": "Voir CCTP 6", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 4" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 2:04:49 PM", + "createdAt": "Apr 11, 2019 2:04:49 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1260" + }, + { + "id": 19964336, + "iid": 1259, + "projectId": 2722779, + "title": "Insertion des lots de débarquements", + "description": "Voir CCTP 5", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 3" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 2:04:17 PM", + "createdAt": "Apr 11, 2019 2:04:17 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1259" + }, + { + "id": 19964296, + "iid": 1258, + "projectId": 2722779, + "title": "Insertion du livre de bord - Formulaire FOB et sous formulaire balise(s)", + "description": "Voir CCTP 4.1.5", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 2" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 2:11:40 PM", + "createdAt": "Apr 11, 2019 2:02:56 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1258" + }, + { + "id": 19964289, + "iid": 1257, + "projectId": 2722779, + "title": "Insertion du livre de bord - Formulaire calée (captures et rejets)", + "description": "Voir CCTP 4.1.4", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 2" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 2:11:47 PM", + "createdAt": "Apr 11, 2019 2:02:44 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1257" + }, + { + "id": 19964273, + "iid": 1256, + "projectId": 2722779, + "title": "Insertion du livre de bord - Formulaire activité", + "description": "Voir CCTP 4.1.3", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 2" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 2:11:53 PM", + "createdAt": "Apr 11, 2019 2:02:03 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1256" + }, + { + "id": 19964256, + "iid": 1255, + "projectId": 2722779, + "title": "Insertion du livre de bord - Formulaire route", + "description": "Voir CCTP 4.1.2", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 2" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 2:11:58 PM", + "createdAt": "Apr 11, 2019 2:01:24 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1255" + }, + { + "id": 19964211, + "iid": 1254, + "projectId": 2722779, + "title": "Réorganisation des données d’observation PS - Retrait des données relatives aux captures cibles", + "description": "Voir CCTP 3.7.3", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 1", + "Senne" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 2:20:25 PM", + "createdAt": "Apr 11, 2019 1:59:43 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1254" + }, + { + "id": 19964188, + "iid": 1253, + "projectId": 2722779, + "title": "Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés", + "description": "Voir CCTP 2.7.2", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 1", + "Senne" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 2:20:24 PM", + "createdAt": "Apr 11, 2019 1:59:10 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1253" + }, + { + "id": 19964177, + "iid": 1252, + "projectId": 2722779, + "title": "Réorganisation des données d’observation PS - Re localisation dans la hiérarchie", + "description": "Voir CCTP 3.7.1", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 1", + "Senne" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 2:20:24 PM", + "createdAt": "Apr 11, 2019 1:58:36 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1252" + }, + { + "id": 19964162, + "iid": 1251, + "projectId": 2722779, + "title": "Ré usinage du formulaire marée PS et des sous-formulaires associés - Choix de la marée dans laquelle démarrer l’acquisition", + "description": "Voir CCTP 3.6.2", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 1", + "Senne" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 2:20:24 PM", + "createdAt": "Apr 11, 2019 1:57:51 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1251" + }, + { + "id": 19964140, + "iid": 1250, + "projectId": 2722779, + "title": "Ré usinage du formulaire marée PS et des sous-formulaires associés - Organisation hiérarchique des données senne", + "description": "Voir CCTP 3.6.1", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 1", + "Senne" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 2:20:24 PM", + "createdAt": "Apr 11, 2019 1:57:17 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1250" + }, + { + "id": 19964116, + "iid": 1249, + "projectId": 2722779, + "title": "Amélioration des fonctionnalités de synchronisation avancées", + "description": "Voir CCTP 3.5", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 1" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 1:56:14 PM", + "createdAt": "Apr 11, 2019 1:56:14 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1249" + }, + { + "id": 19964084, + "iid": 1248, + "projectId": 2722779, + "title": "Mise à jour du module cartographie avec les nouvelles données", + "description": "Voir CCTP 3.4", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 1" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 1:54:53 PM", + "createdAt": "Apr 11, 2019 1:54:53 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1248" + }, + { + "id": 19963938, + "iid": 1247, + "projectId": 2722779, + "title": "Modes de fonctionnement complet et simplifié", + "description": "Voir CCTP 3.1", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 1" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 1:52:55 PM", + "createdAt": "Apr 11, 2019 1:52:55 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1247" + }, + { + "id": 19962972, + "iid": 1246, + "projectId": 2722779, + "title": "Nouveaux raccourcis de navigation dans l’arbre", + "description": "Voir CCTP 3.2", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 1" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 1:53:29 PM", + "createdAt": "Apr 11, 2019 1:40:22 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1246" + }, + { + "id": 19962426, + "iid": 1245, + "projectId": 2722779, + "title": "Appariement entre activités observées et activités du livre de bord", + "description": "Voir CCTP 3.3\n", + "labels": [ + "Evolution", + "IRD-2018-02-V9", + "Module 1" + ], + "milestone": { + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 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": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Apr 11, 2019 1:53:58 PM", + "createdAt": "Apr 11, 2019 1:30:02 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1245" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/845431.json ===================================== @@ -0,0 +1,11 @@ +{ + "id": 845431, + "iid": 139, + "projectId": 2722779, + "groupId": 0, + "title": "Contrat RECOLAPE 2019", + "description": "", + "dueDate": "May 11, 2023 2:00:00 AM", + "startDate": "Apr 11, 2019 2:00:00 AM", + "state": "active" +} \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/866537-issues.json ===================================== @@ -0,0 +1,58 @@ +[ + { + "id": 20078138, + "iid": 1269, + "projectId": 2722779, + "title": "[TREE] Parfois un affichage tronqué sans raison", + "description": "Vu avec la v7.0.5 et v7.0.6 :\n\n![image](/uploads/0340bff3be051a10bfbbd47cbc312230/image.png)\n\n![image](/uploads/4c6f4de473bae2e152345b780d43fac6/image.png)", + "labels": [], + "milestone": { + "id": 866537, + "iid": 140, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.7", + "description": "", + "startDate": "May 6, 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": "May 6, 2019 1:46:46 PM", + "createdAt": "Apr 15, 2019 6:27:13 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1269" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/866537.json ===================================== @@ -0,0 +1,10 @@ +{ + "id": 866537, + "iid": 140, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.7", + "description": "", + "startDate": "May 6, 2019 2:00:00 AM", + "state": "active" +} \ No newline at end of file ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2019-04-11 10:29. + * Last generated at 2019-05-06 13:50. ## 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. @@ -118,8 +118,8 @@ Premier lot du contrat IRD-2018-01-V8 **Closed at 2019-04-11.** ### Download -* [Application (observe-7.0.6-SNAPSHOT.zip)](https://ultreia.io/release/observe-7.0.6-SNAPSHOT.zip) -* [Serveur (observe-7.0.6-SNAPSHOT.war)](https://ultreia.io/release/observe-7.0.6-SNAPSHOT.war) +* [Application (observe-7.0.6.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/7.…) +* [Serveur (observe-7.0.6.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/7.…) ### Issues * [[Anomalie 1202]](https://gitlab.com/ultreiaio/ird-observe/issues/1202) **[UI] Listes déroulantes : ergonomie** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4e6d2f2c573b229548ead0e272f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4e6d2f2c573b229548ead0e272f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Bug requête tableau synthèse DCP - Closes #1244
by Tony CHEMIT 30 Apr '19

30 Apr '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 568fb6ac by tchemit at 2019-04-30T11:16:37Z Bug requête tableau synthèse DCP - Closes #1244 - - - - - 1d93b093 by tchemit at 2019-04-30T11:16:38Z update pom - - - - - 3 changed files: - pom.xml - services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportDcpUsageTest.java - services/src/main/resources/observe-reports.properties Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.14</version> + <version>2019.8.15</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportDcpUsageTest.java ===================================== @@ -45,8 +45,8 @@ public class ReportDcpUsageTest extends AbstractReportServiceLocalTest { Assert.assertNotNull(report); assertReportName( report, - "Utilisation des DCP", - "Tableau récapitulatif du nombre de DCP visités selon l’action effectuée (visites avec et sans pêche, mis à l’eau, récuperation), et tortues observées" + "Utilisation des FOB", + "Tableau récapitulatif du nombre de FOB visités selon l’action effectuée (visites avec et sans pêche, mis à l’eau, récuperation), et tortues observées" ); /* @@ -56,15 +56,15 @@ public class ReportDcpUsageTest extends AbstractReportServiceLocalTest { report, -1, 11, - new String[]{"Type de DCP (Tableau 8)", - "Visités", + new String[]{"Type de FOB (Tableau 8)", + "Visités sans pêche", "Pêchés", "Mis à l’eau seuls", - "Modifications ou renforcements", - "Retaits", + "Modifiés ou renforcés", + "Retirés", "Abandonnés (sans balise ou non détruit ou non coulé)", "Coulés", - "Remplacements", + "Remplacés", "Autre (péciser dans les notes)", "Tortues associées" } ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -119,12 +119,12 @@ report.dailySetAndCatch.request.1=0,0|row|\ Group By r.date \ Order By r.date ################################################################################ -## Utilisation des DCP +## Utilisation des FOB ################################################################################ report.dcpUsage.modelType=PS -report.dcpUsage.name=Utilisation des DCP -report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de DCP visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es -report.dcpUsage.columns=Type de DCP (Tableau 8),Visit\u00e9s,P\u00each\u00e9s,Mis \u00e0 l\u2019eau seuls,Modifications ou renforcements,Retaits,Abandonn\u00e9s (sans balise ou non d\u00e9truit ou non coul\u00e9),Coul\u00e9s,Remplacements,Autre (p\u00e9ciser dans les notes),Tortues associ\u00e9es +report.dcpUsage.name=Utilisation des FOB +report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de FOB visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es +report.dcpUsage.columns=Type de FOB (Tableau 8),Visit\u00e9s sans p\u00eache,P\u00each\u00e9s,Mis \u00e0 l\u2019eau seuls,Modifi\u00e9s ou renforc\u00e9s,Retir\u00e9s,Abandonn\u00e9s (sans balise ou non d\u00e9truit ou non coul\u00e9),Coul\u00e9s,Remplac\u00e9s,Autre (p\u00e9ciser dans les notes),Tortues associ\u00e9es report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Select distinct (om.standardCode) \ From ObjectMaterialImpl om \ @@ -137,13 +137,14 @@ report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode Or dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode) \ + and (dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode Or dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode) \ ) > 0 report.dcpUsage.request.1=0,0|row|\ - Select concat(str(to.standardCode) , ' - ', to.label2) \ - From ObjectMaterialImpl to \ + Select concat(str(om.standardCode) , ' - ', om.label2) \ + From ObjectMaterialImpl om \ Where \ - to.standardCode = :typeObjetId + om.standardCode = :typeObjetId \ + And om.status != 0 report.dcpUsage.request.1.repeat=typeObjetId|column # visite report.dcpUsage.request.2=1,0|row|\ @@ -154,8 +155,9 @@ report.dcpUsage.request.2=1,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ - and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#2' + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#2' \ + and a.vesselActivitySeine.id != 'fr.ird.referential.ps.observation.VesselActivitySeine#1239832675369#0.12552908048322586' report.dcpUsage.request.2.repeat=typeObjetId|column # peche report.dcpUsage.request.3=2,0|row|\ @@ -166,8 +168,8 @@ report.dcpUsage.request.3=2,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ - and (dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.referential.ps.common.VesselActivitySeine#1239832675369#0.12552908048322586') + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and (dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.referential.ps.observation.VesselActivitySeine#1239832675369#0.12552908048322586') report.dcpUsage.request.3.repeat=typeObjetId|column # mis a l'eau report.dcpUsage.request.4=3,0|row|\ @@ -178,10 +180,10 @@ report.dcpUsage.request.4=3,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#1' report.dcpUsage.request.4.repeat=typeObjetId|column -# modification ou rneforcement +# modification ou renforcement #FIXME Supprime de la requete du dessous #FIXME and dcp.objectFate.id = 'fr.ird.referential.ps.ObjectFate#1396860761530#0.8869464242156488' \ report.dcpUsage.request.5=4,0|row|\ @@ -192,7 +194,7 @@ report.dcpUsage.request.5=4,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#8' report.dcpUsage.request.5.repeat=typeObjetId|column # Retrait @@ -204,7 +206,7 @@ report.dcpUsage.request.6=5,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#4' report.dcpUsage.request.6.repeat=typeObjetId|column # abondonne @@ -216,7 +218,7 @@ report.dcpUsage.request.7=6,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#5' report.dcpUsage.request.7.repeat=typeObjetId|column # coule @@ -228,7 +230,7 @@ report.dcpUsage.request.8=7,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#7' report.dcpUsage.request.8.repeat=typeObjetId|column # remplacement @@ -240,7 +242,7 @@ report.dcpUsage.request.9=8,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#09' report.dcpUsage.request.9.repeat=typeObjetId|column # autre @@ -252,7 +254,7 @@ report.dcpUsage.request.10=9,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#10' report.dcpUsage.request.10.repeat=typeObjetId|column # tortues @@ -265,7 +267,7 @@ report.dcpUsage.request.11=10,0|row| \ Join dcp.objectObservedSpecies efo \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461' report.dcpUsage.request.11.repeat=typeObjetId|column View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1513125bae3c62ec0b4603034a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1513125bae3c62ec0b4603034a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 3 commits: Bug requête tableau synthèse DCP - Closes #1244
by Tony CHEMIT 30 Apr '19

30 Apr '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 45c57bed by tchemit at 2019-04-30T10:49:13Z Bug requête tableau synthèse DCP - Closes #1244 - - - - - 39873c4c by tchemit at 2019-04-30T10:49:14Z update pom - - - - - 53e7aae3 by tchemit at 2019-04-30T10:49:14Z Il manques des traductions... - - - - - 9 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - pom.xml - services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportDcpUsageTest.java - services/src/main/resources/observe-reports.properties Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -570,6 +570,7 @@ observe.common.TargetCatchDto.table.deleteExtraMessage observe.common.TargetCatchDto.table.speciesThon.tip observe.common.TargetCatchDto.table.weightCategory.tip observe.common.TargetCatchDto.table.well.tip +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver observe.common.TargetCatchDto.title observe.common.TargetCatchDto.weightCategory observe.common.TargetCatchDto.well @@ -581,6 +582,7 @@ observe.common.TargetDiscardDto.table.deleteExtraMessage observe.common.TargetDiscardDto.table.reasonForDiscard.tip observe.common.TargetDiscardDto.table.species.tip observe.common.TargetDiscardDto.table.weightCategory.tip +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver observe.common.TargetLengthDto.count observe.common.TargetLengthDto.length observe.common.TargetLengthDto.tagNumber ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss ===================================== @@ -69,6 +69,7 @@ horizontalTextPosition:{JCheckBox.LEFT}; _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER}; selected:{BooleanUtils.isTrue(bean.isTargetCatchCompositionEstimatedByObserver())}; + text:"observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver"; } #moveUp { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss ===================================== @@ -75,6 +75,7 @@ horizontalTextPosition:{JCheckBox.LEFT}; _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_DISCARD_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER}; selected:{BooleanUtils.isTrue(bean.isTargetDiscardCatchCompositionEstimatedByObserver())}; + text:"observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver"; } #moveUp { ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Vessel speed (kts) observe.common.SetLonglineDto.shooterSpeed=Shooter speed (kts) observe.common.SetLonglineDto.snapWeight=Snap weight (kg) observe.common.SetLonglineDto.swivelWeight=swivel weight (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.SetLonglineDto.timeBetweenHooks=time between hooks observe.common.SetLonglineDto.title=Fishing operation observe.common.SetLonglineDto.totalBasketsCount=Total baskets count @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Weight category observe.common.TargetCatchDto.table.weightCategory.tip=Weight category observe.common.TargetCatchDto.table.well=Well observe.common.TargetCatchDto.table.well.tip=Well +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.TargetCatchDto.title=Target catch observe.common.TargetCatchDto.type=Target catch observe.common.TargetCatchDto.types=Target catches @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Weight (in t) observe.common.TargetDiscardDto.table.weight.tip=Weight (in t) observe.common.TargetDiscardDto.table.weightCategory=Weight category observe.common.TargetDiscardDto.table.weightCategory.tip=Weight category +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.TargetLengthDto.count=Count observe.common.TargetLengthDto.length=Length (cm) observe.common.TargetLengthDto.table.count=Count ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Velocidad del barco (nd) observe.common.SetLonglineDto.shooterSpeed=Velocidad virador (nd) observe.common.SetLonglineDto.snapWeight=Peso mosquetón (kg) observe.common.SetLonglineDto.swivelWeight=Peso destorcedor (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.SetLonglineDto.timeBetweenHooks=Tiempo entre anzuelos (s) observe.common.SetLonglineDto.title=Operación de pesca observe.common.SetLonglineDto.totalBasketsCount=Número total de canastas @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Categoría de peso observe.common.TargetCatchDto.table.weightCategory.tip=Categoría de peso observe.common.TargetCatchDto.table.well=Cuba observe.common.TargetCatchDto.table.well.tip=Cuba +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.TargetCatchDto.title=Captura de túnidos observe.common.TargetCatchDto.type=Captura de túnidos observe.common.TargetCatchDto.types=Capturas de túnidos @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Peso observe.common.TargetDiscardDto.table.weight.tip=Peso (en t) observe.common.TargetDiscardDto.table.weightCategory=Categoría de peso observe.common.TargetDiscardDto.table.weightCategory.tip=Categoría de peso +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.TargetLengthDto.count=Número observe.common.TargetLengthDto.length=Talla (cm) observe.common.TargetLengthDto.table.count=Número ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Vitesse bateau (nd) observe.common.SetLonglineDto.shooterSpeed=Vitesse shooter (nd) observe.common.SetLonglineDto.snapWeight=Poids snap (kg) observe.common.SetLonglineDto.swivelWeight=Poids de l'émerillon (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.SetLonglineDto.timeBetweenHooks=Temps entre hameçons (s) observe.common.SetLonglineDto.title=Opération de pêche observe.common.SetLonglineDto.totalBasketsCount=Nombre total de paniers @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Catégorie de poids observe.common.TargetCatchDto.table.weightCategory.tip=Catégorie de poids observe.common.TargetCatchDto.table.well=Cuve observe.common.TargetCatchDto.table.well.tip=Cuve +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.TargetCatchDto.title=Thons conservés observe.common.TargetCatchDto.type=Thons conservés observe.common.TargetCatchDto.types=Thons conservés @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Poids observe.common.TargetDiscardDto.table.weight.tip=Poids (en t) observe.common.TargetDiscardDto.table.weightCategory=Catégorie de poids observe.common.TargetDiscardDto.table.weightCategory.tip=Catégorie de poids +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.TargetLengthDto.count=Nombre observe.common.TargetLengthDto.length=Taille (en cm) observe.common.TargetLengthDto.table.count=Effectif ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.14</version> + <version>2019.8.15</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportDcpUsageTest.java ===================================== @@ -45,8 +45,8 @@ public class ReportDcpUsageTest extends AbstractReportServiceLocalTest { Assert.assertNotNull(report); assertReportName( report, - "Utilisation des DCP", - "Tableau récapitulatif du nombre de DCP visités selon l’action effectuée (visites avec et sans pêche, mis à l’eau, récuperation), et tortues observées" + "Utilisation des FOB", + "Tableau récapitulatif du nombre de FOB visités selon l’action effectuée (visites avec et sans pêche, mis à l’eau, récuperation), et tortues observées" ); /* @@ -56,15 +56,15 @@ public class ReportDcpUsageTest extends AbstractReportServiceLocalTest { report, -1, 11, - new String[]{"Type de DCP (Tableau 8)", - "Visités", + new String[]{"Type de FOB (Tableau 8)", + "Visités sans pêche", "Pêchés", "Mis à l’eau seuls", - "Modifications ou renforcements", - "Retaits", + "Modifiés ou renforcés", + "Retirés", "Abandonnés (sans balise ou non détruit ou non coulé)", "Coulés", - "Remplacements", + "Remplacés", "Autre (péciser dans les notes)", "Tortues associées" } ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -119,12 +119,12 @@ report.dailySetAndCatch.request.1=0,0|row|\ Group By r.date \ Order By r.date ################################################################################ -## Utilisation des DCP +## Utilisation des FOB ################################################################################ report.dcpUsage.modelType=PS -report.dcpUsage.name=Utilisation des DCP -report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de DCP visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es -report.dcpUsage.columns=Type de DCP (Tableau 8),Visit\u00e9s,P\u00each\u00e9s,Mis \u00e0 l\u2019eau seuls,Modifications ou renforcements,Retaits,Abandonn\u00e9s (sans balise ou non d\u00e9truit ou non coul\u00e9),Coul\u00e9s,Remplacements,Autre (p\u00e9ciser dans les notes),Tortues associ\u00e9es +report.dcpUsage.name=Utilisation des FOB +report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de FOB visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es +report.dcpUsage.columns=Type de FOB (Tableau 8),Visit\u00e9s sans p\u00eache,P\u00each\u00e9s,Mis \u00e0 l\u2019eau seuls,Modifi\u00e9s ou renforc\u00e9s,Retir\u00e9s,Abandonn\u00e9s (sans balise ou non d\u00e9truit ou non coul\u00e9),Coul\u00e9s,Remplac\u00e9s,Autre (p\u00e9ciser dans les notes),Tortues associ\u00e9es report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Select distinct (om.standardCode) \ From ObjectMaterialImpl om \ @@ -137,13 +137,14 @@ report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode Or dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode) \ + and (dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode Or dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode) \ ) > 0 report.dcpUsage.request.1=0,0|row|\ - Select concat(str(to.standardCode) , ' - ', to.label2) \ - From ObjectMaterialImpl to \ + Select concat(str(om.standardCode) , ' - ', om.label2) \ + From ObjectMaterialImpl om \ Where \ - to.standardCode = :typeObjetId + om.standardCode = :typeObjetId \ + And om.status != 0 report.dcpUsage.request.1.repeat=typeObjetId|column # visite report.dcpUsage.request.2=1,0|row|\ @@ -154,8 +155,9 @@ report.dcpUsage.request.2=1,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \ + and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' report.dcpUsage.request.2.repeat=typeObjetId|column # peche report.dcpUsage.request.3=2,0|row|\ @@ -166,7 +168,7 @@ report.dcpUsage.request.3=2,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586') report.dcpUsage.request.3.repeat=typeObjetId|column # mis a l'eau @@ -178,10 +180,10 @@ report.dcpUsage.request.4=3,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' report.dcpUsage.request.4.repeat=typeObjetId|column -# modification ou rneforcement +# modification ou renforcement #FIXME Supprime de la requete du dessous #FIXME and dcp.objectFate.id = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488' \ report.dcpUsage.request.5=4,0|row|\ @@ -192,7 +194,7 @@ report.dcpUsage.request.5=4,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' report.dcpUsage.request.5.repeat=typeObjetId|column # Retrait @@ -204,7 +206,7 @@ report.dcpUsage.request.6=5,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' report.dcpUsage.request.6.repeat=typeObjetId|column # abondonne @@ -216,7 +218,7 @@ report.dcpUsage.request.7=6,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' report.dcpUsage.request.7.repeat=typeObjetId|column # coule @@ -228,7 +230,7 @@ report.dcpUsage.request.8=7,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' report.dcpUsage.request.8.repeat=typeObjetId|column # remplacement @@ -240,7 +242,7 @@ report.dcpUsage.request.9=8,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#09' report.dcpUsage.request.9.repeat=typeObjetId|column # autre @@ -252,7 +254,7 @@ report.dcpUsage.request.10=9,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' report.dcpUsage.request.10.repeat=typeObjetId|column # tortues @@ -265,7 +267,7 @@ report.dcpUsage.request.11=10,0|row| \ Join dcp.objectObservedSpecies efo \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' report.dcpUsage.request.11.repeat=typeObjetId|column View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a4c230a99687cc621d574bfc2a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a4c230a99687cc621d574bfc2a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 3 commits: Bug requête tableau synthèse DCP - Closes #1244
by Tony CHEMIT 30 Apr '19

30 Apr '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 747bdbb8 by tchemit at 2019-04-30T10:40:42Z Bug requête tableau synthèse DCP - Closes #1244 - - - - - 8c479471 by tchemit at 2019-04-30T10:40:44Z update pom - - - - - a4c230a9 by tchemit at 2019-04-30T10:40:44Z Il manques des traductions... - - - - - 8 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - pom.xml - services/src/main/resources/observe-reports.properties Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -570,6 +570,7 @@ observe.common.TargetCatchDto.table.deleteExtraMessage observe.common.TargetCatchDto.table.speciesThon.tip observe.common.TargetCatchDto.table.weightCategory.tip observe.common.TargetCatchDto.table.well.tip +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver observe.common.TargetCatchDto.title observe.common.TargetCatchDto.weightCategory observe.common.TargetCatchDto.well @@ -581,6 +582,7 @@ observe.common.TargetDiscardDto.table.deleteExtraMessage observe.common.TargetDiscardDto.table.reasonForDiscard.tip observe.common.TargetDiscardDto.table.species.tip observe.common.TargetDiscardDto.table.weightCategory.tip +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver observe.common.TargetLengthDto.count observe.common.TargetLengthDto.length observe.common.TargetLengthDto.tagNumber ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss ===================================== @@ -69,6 +69,7 @@ horizontalTextPosition:{JCheckBox.LEFT}; _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER}; selected:{BooleanUtils.isTrue(bean.isTargetCatchCompositionEstimatedByObserver())}; + text:"observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver"; } #moveUp { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss ===================================== @@ -75,6 +75,7 @@ horizontalTextPosition:{JCheckBox.LEFT}; _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_DISCARD_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER}; selected:{BooleanUtils.isTrue(bean.isTargetDiscardCatchCompositionEstimatedByObserver())}; + text:"observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver"; } #moveUp { ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Vessel speed (kts) observe.common.SetLonglineDto.shooterSpeed=Shooter speed (kts) observe.common.SetLonglineDto.snapWeight=Snap weight (kg) observe.common.SetLonglineDto.swivelWeight=swivel weight (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.SetLonglineDto.timeBetweenHooks=time between hooks observe.common.SetLonglineDto.title=Fishing operation observe.common.SetLonglineDto.totalBasketsCount=Total baskets count @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Weight category observe.common.TargetCatchDto.table.weightCategory.tip=Weight category observe.common.TargetCatchDto.table.well=Well observe.common.TargetCatchDto.table.well.tip=Well +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.TargetCatchDto.title=Target catch observe.common.TargetCatchDto.type=Target catch observe.common.TargetCatchDto.types=Target catches @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Weight (in t) observe.common.TargetDiscardDto.table.weight.tip=Weight (in t) observe.common.TargetDiscardDto.table.weightCategory=Weight category observe.common.TargetDiscardDto.table.weightCategory.tip=Weight category +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.TargetLengthDto.count=Count observe.common.TargetLengthDto.length=Length (cm) observe.common.TargetLengthDto.table.count=Count ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Velocidad del barco (nd) observe.common.SetLonglineDto.shooterSpeed=Velocidad virador (nd) observe.common.SetLonglineDto.snapWeight=Peso mosquetón (kg) observe.common.SetLonglineDto.swivelWeight=Peso destorcedor (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.SetLonglineDto.timeBetweenHooks=Tiempo entre anzuelos (s) observe.common.SetLonglineDto.title=Operación de pesca observe.common.SetLonglineDto.totalBasketsCount=Número total de canastas @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Categoría de peso observe.common.TargetCatchDto.table.weightCategory.tip=Categoría de peso observe.common.TargetCatchDto.table.well=Cuba observe.common.TargetCatchDto.table.well.tip=Cuba +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.TargetCatchDto.title=Captura de túnidos observe.common.TargetCatchDto.type=Captura de túnidos observe.common.TargetCatchDto.types=Capturas de túnidos @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Peso observe.common.TargetDiscardDto.table.weight.tip=Peso (en t) observe.common.TargetDiscardDto.table.weightCategory=Categoría de peso observe.common.TargetDiscardDto.table.weightCategory.tip=Categoría de peso +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.TargetLengthDto.count=Número observe.common.TargetLengthDto.length=Talla (cm) observe.common.TargetLengthDto.table.count=Número ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Vitesse bateau (nd) observe.common.SetLonglineDto.shooterSpeed=Vitesse shooter (nd) observe.common.SetLonglineDto.snapWeight=Poids snap (kg) observe.common.SetLonglineDto.swivelWeight=Poids de l'émerillon (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.SetLonglineDto.timeBetweenHooks=Temps entre hameçons (s) observe.common.SetLonglineDto.title=Opération de pêche observe.common.SetLonglineDto.totalBasketsCount=Nombre total de paniers @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Catégorie de poids observe.common.TargetCatchDto.table.weightCategory.tip=Catégorie de poids observe.common.TargetCatchDto.table.well=Cuve observe.common.TargetCatchDto.table.well.tip=Cuve +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.TargetCatchDto.title=Thons conservés observe.common.TargetCatchDto.type=Thons conservés observe.common.TargetCatchDto.types=Thons conservés @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Poids observe.common.TargetDiscardDto.table.weight.tip=Poids (en t) observe.common.TargetDiscardDto.table.weightCategory=Catégorie de poids observe.common.TargetDiscardDto.table.weightCategory.tip=Catégorie de poids +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.TargetLengthDto.count=Nombre observe.common.TargetLengthDto.length=Taille (en cm) observe.common.TargetLengthDto.table.count=Effectif ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.14</version> + <version>2019.8.15</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -119,12 +119,12 @@ report.dailySetAndCatch.request.1=0,0|row|\ Group By r.date \ Order By r.date ################################################################################ -## Utilisation des DCP +## Utilisation des FOB ################################################################################ report.dcpUsage.modelType=PS -report.dcpUsage.name=Utilisation des DCP -report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de DCP visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es -report.dcpUsage.columns=Type de DCP (Tableau 8),Visit\u00e9s,P\u00each\u00e9s,Mis \u00e0 l\u2019eau seuls,Modifications ou renforcements,Retaits,Abandonn\u00e9s (sans balise ou non d\u00e9truit ou non coul\u00e9),Coul\u00e9s,Remplacements,Autre (p\u00e9ciser dans les notes),Tortues associ\u00e9es +report.dcpUsage.name=Utilisation des FOB +report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de FOB visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es +report.dcpUsage.columns=Type de FOB (Tableau 8),Visit\u00e9s sans p\u00eache,P\u00each\u00e9s,Mis \u00e0 l\u2019eau seuls,Modifi\u00e9s ou renforc\u00e9s,Retir\u00e9s,Abandonn\u00e9s (sans balise ou non d\u00e9truit ou non coul\u00e9),Coul\u00e9s,Remplac\u00e9s,Autre (p\u00e9ciser dans les notes),Tortues associ\u00e9es report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Select distinct (om.standardCode) \ From ObjectMaterialImpl om \ @@ -137,13 +137,14 @@ report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode Or dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode) \ + and (dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode Or dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode) \ ) > 0 report.dcpUsage.request.1=0,0|row|\ - Select concat(str(to.standardCode) , ' - ', to.label2) \ - From ObjectMaterialImpl to \ + Select concat(str(om.standardCode) , ' - ', om.label2) \ + From ObjectMaterialImpl om \ Where \ - to.standardCode = :typeObjetId + om.standardCode = :typeObjetId \ + And om.status != 0 report.dcpUsage.request.1.repeat=typeObjetId|column # visite report.dcpUsage.request.2=1,0|row|\ @@ -154,8 +155,9 @@ report.dcpUsage.request.2=1,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \ + and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' report.dcpUsage.request.2.repeat=typeObjetId|column # peche report.dcpUsage.request.3=2,0|row|\ @@ -166,7 +168,7 @@ report.dcpUsage.request.3=2,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586') report.dcpUsage.request.3.repeat=typeObjetId|column # mis a l'eau @@ -178,10 +180,10 @@ report.dcpUsage.request.4=3,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' report.dcpUsage.request.4.repeat=typeObjetId|column -# modification ou rneforcement +# modification ou renforcement #FIXME Supprime de la requete du dessous #FIXME and dcp.objectFate.id = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488' \ report.dcpUsage.request.5=4,0|row|\ @@ -192,7 +194,7 @@ report.dcpUsage.request.5=4,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' report.dcpUsage.request.5.repeat=typeObjetId|column # Retrait @@ -204,7 +206,7 @@ report.dcpUsage.request.6=5,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' report.dcpUsage.request.6.repeat=typeObjetId|column # abondonne @@ -216,7 +218,7 @@ report.dcpUsage.request.7=6,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' report.dcpUsage.request.7.repeat=typeObjetId|column # coule @@ -228,7 +230,7 @@ report.dcpUsage.request.8=7,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' report.dcpUsage.request.8.repeat=typeObjetId|column # remplacement @@ -240,7 +242,7 @@ report.dcpUsage.request.9=8,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#09' report.dcpUsage.request.9.repeat=typeObjetId|column # autre @@ -252,7 +254,7 @@ report.dcpUsage.request.10=9,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' report.dcpUsage.request.10.repeat=typeObjetId|column # tortues @@ -265,7 +267,7 @@ report.dcpUsage.request.11=10,0|row| \ Join dcp.objectObservedSpecies efo \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' report.dcpUsage.request.11.repeat=typeObjetId|column View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c3206aa8fec058c7fcaae635ef… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c3206aa8fec058c7fcaae635ef… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: update pom
by Tony CHEMIT 28 Apr '19

28 Apr '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f3437ba3 by tchemit at 2019-04-28T12:51:05Z update pom - - - - - c3206aa8 by tchemit at 2019-04-28T13:18:16Z Il manques des traductions... - - - - - 7 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - pom.xml Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -570,6 +570,7 @@ observe.common.TargetCatchDto.table.deleteExtraMessage observe.common.TargetCatchDto.table.speciesThon.tip observe.common.TargetCatchDto.table.weightCategory.tip observe.common.TargetCatchDto.table.well.tip +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver observe.common.TargetCatchDto.title observe.common.TargetCatchDto.weightCategory observe.common.TargetCatchDto.well @@ -581,6 +582,7 @@ observe.common.TargetDiscardDto.table.deleteExtraMessage observe.common.TargetDiscardDto.table.reasonForDiscard.tip observe.common.TargetDiscardDto.table.species.tip observe.common.TargetDiscardDto.table.weightCategory.tip +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver observe.common.TargetLengthDto.count observe.common.TargetLengthDto.length observe.common.TargetLengthDto.tagNumber ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUI.jcss ===================================== @@ -69,6 +69,7 @@ horizontalTextPosition:{JCheckBox.LEFT}; _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER}; selected:{BooleanUtils.isTrue(bean.isTargetCatchCompositionEstimatedByObserver())}; + text:"observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver"; } #moveUp { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUI.jcss ===================================== @@ -75,6 +75,7 @@ horizontalTextPosition:{JCheckBox.LEFT}; _propertyName:{SetSeineTargetCatchDto.PROPERTY_TARGET_DISCARD_CATCH_COMPOSITION_ESTIMATED_BY_OBSERVER}; selected:{BooleanUtils.isTrue(bean.isTargetDiscardCatchCompositionEstimatedByObserver())}; + text:"observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver"; } #moveUp { ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Vessel speed (kts) observe.common.SetLonglineDto.shooterSpeed=Shooter speed (kts) observe.common.SetLonglineDto.snapWeight=Snap weight (kg) observe.common.SetLonglineDto.swivelWeight=swivel weight (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.SetLonglineDto.timeBetweenHooks=time between hooks observe.common.SetLonglineDto.title=Fishing operation observe.common.SetLonglineDto.totalBasketsCount=Total baskets count @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Weight category observe.common.TargetCatchDto.table.weightCategory.tip=Weight category observe.common.TargetCatchDto.table.well=Well observe.common.TargetCatchDto.table.well.tip=Well +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.TargetCatchDto.title=Target catch observe.common.TargetCatchDto.type=Target catch observe.common.TargetCatchDto.types=Target catches @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Weight (in t) observe.common.TargetDiscardDto.table.weight.tip=Weight (in t) observe.common.TargetDiscardDto.table.weightCategory=Weight category observe.common.TargetDiscardDto.table.weightCategory.tip=Weight category +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.TargetLengthDto.count=Count observe.common.TargetLengthDto.length=Length (cm) observe.common.TargetLengthDto.table.count=Count ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Velocidad del barco (nd) observe.common.SetLonglineDto.shooterSpeed=Velocidad virador (nd) observe.common.SetLonglineDto.snapWeight=Peso mosquetón (kg) observe.common.SetLonglineDto.swivelWeight=Peso destorcedor (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.SetLonglineDto.timeBetweenHooks=Tiempo entre anzuelos (s) observe.common.SetLonglineDto.title=Operación de pesca observe.common.SetLonglineDto.totalBasketsCount=Número total de canastas @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Categoría de peso observe.common.TargetCatchDto.table.weightCategory.tip=Categoría de peso observe.common.TargetCatchDto.table.well=Cuba observe.common.TargetCatchDto.table.well.tip=Cuba +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.TargetCatchDto.title=Captura de túnidos observe.common.TargetCatchDto.type=Captura de túnidos observe.common.TargetCatchDto.types=Capturas de túnidos @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Peso observe.common.TargetDiscardDto.table.weight.tip=Peso (en t) observe.common.TargetDiscardDto.table.weightCategory=Categoría de peso observe.common.TargetDiscardDto.table.weightCategory.tip=Categoría de peso +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=¿Composición estimada por el observador? observe.common.TargetLengthDto.count=Número observe.common.TargetLengthDto.length=Talla (cm) observe.common.TargetLengthDto.table.count=Número ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1253,8 +1253,6 @@ observe.common.SetLonglineDto.settingVesselSpeed=Vitesse bateau (nd) observe.common.SetLonglineDto.shooterSpeed=Vitesse shooter (nd) observe.common.SetLonglineDto.snapWeight=Poids snap (kg) observe.common.SetLonglineDto.swivelWeight=Poids de l'émerillon (kg) -observe.common.SetLonglineDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? -observe.common.SetLonglineDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.SetLonglineDto.timeBetweenHooks=Temps entre hameçons (s) observe.common.SetLonglineDto.title=Opération de pêche observe.common.SetLonglineDto.totalBasketsCount=Nombre total de paniers @@ -1387,6 +1385,7 @@ observe.common.TargetCatchDto.table.weightCategory=Catégorie de poids observe.common.TargetCatchDto.table.weightCategory.tip=Catégorie de poids observe.common.TargetCatchDto.table.well=Cuve observe.common.TargetCatchDto.table.well.tip=Cuve +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.TargetCatchDto.title=Thons conservés observe.common.TargetCatchDto.type=Thons conservés observe.common.TargetCatchDto.types=Thons conservés @@ -1410,6 +1409,7 @@ observe.common.TargetDiscardDto.table.weight=Poids observe.common.TargetDiscardDto.table.weight.tip=Poids (en t) observe.common.TargetDiscardDto.table.weightCategory=Catégorie de poids observe.common.TargetDiscardDto.table.weightCategory.tip=Catégorie de poids +observe.common.TargetDiscardDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.TargetLengthDto.count=Nombre observe.common.TargetLengthDto.length=Taille (en cm) observe.common.TargetLengthDto.table.count=Effectif ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.14</version> + <version>2019.8.15</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f4054443251e66d6b148550236… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f4054443251e66d6b148550236… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update pom
by Tony CHEMIT 28 Apr '19

28 Apr '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1513125b by tchemit at 2019-04-28T12:57:53Z update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.14</version> + <version>2019.8.15</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1513125bae3c62ec0b4603034a5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1513125bae3c62ec0b4603034a5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Bug requête tableau synthèse DCP - Closes #1244
by Tony CHEMIT 28 Apr '19

28 Apr '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 200e1417 by tchemit at 2019-04-28T12:15:50Z Bug requête tableau synthèse DCP - Closes #1244 - - - - - 1 changed file: - services/src/main/resources/observe-reports.properties Changes: ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -137,13 +137,14 @@ report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode Or dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode) \ + and dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode \ ) > 0 report.dcpUsage.request.1=0,0|row|\ - Select concat(str(to.standardCode) , ' - ', to.label2) \ - From ObjectMaterialImpl to \ + Select concat(str(om.standardCode) , ' - ', om.label2) \ + From ObjectMaterialImpl om \ Where \ - to.standardCode = :typeObjetId + om.standardCode = :typeObjetId \ + And om.status != 0 report.dcpUsage.request.1.repeat=typeObjetId|column # visite report.dcpUsage.request.2=1,0|row|\ @@ -154,7 +155,7 @@ report.dcpUsage.request.2=1,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#2' report.dcpUsage.request.2.repeat=typeObjetId|column # peche @@ -166,7 +167,7 @@ report.dcpUsage.request.3=2,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and (dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.referential.ps.common.VesselActivitySeine#1239832675369#0.12552908048322586') report.dcpUsage.request.3.repeat=typeObjetId|column # mis a l'eau @@ -178,7 +179,7 @@ report.dcpUsage.request.4=3,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#1' report.dcpUsage.request.4.repeat=typeObjetId|column # modification ou rneforcement @@ -192,7 +193,7 @@ report.dcpUsage.request.5=4,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#8' report.dcpUsage.request.5.repeat=typeObjetId|column # Retrait @@ -204,7 +205,7 @@ report.dcpUsage.request.6=5,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#4' report.dcpUsage.request.6.repeat=typeObjetId|column # abondonne @@ -216,7 +217,7 @@ report.dcpUsage.request.7=6,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#5' report.dcpUsage.request.7.repeat=typeObjetId|column # coule @@ -228,7 +229,7 @@ report.dcpUsage.request.8=7,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#7' report.dcpUsage.request.8.repeat=typeObjetId|column # remplacement @@ -240,7 +241,7 @@ report.dcpUsage.request.9=8,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#09' report.dcpUsage.request.9.repeat=typeObjetId|column # autre @@ -252,7 +253,7 @@ report.dcpUsage.request.10=9,0|row|\ Join a.floatingObject dcp \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#10' report.dcpUsage.request.10.repeat=typeObjetId|column # tortues @@ -265,7 +266,7 @@ report.dcpUsage.request.11=10,0|row| \ Join dcp.objectObservedSpecies efo \ Where \ m.id In :tripId \ - and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ and efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461' report.dcpUsage.request.11.repeat=typeObjetId|column View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/200e1417d430b49a1e34afd61c1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/200e1417d430b49a1e34afd61c1… You're receiving this email because of your account on gitlab.com.

1 0