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

[Git][ultreiaio/ird-observe][develop] 6 commits: pb traduction pop up activité observée associée - Closes #1289
by Tony CHEMIT 24 May '19

24 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 39d4aa48 by tchemit at 2019-05-24T11:29:54Z pb traduction pop up activité observée associée - Closes #1289 - - - - - b5b82405 by tchemit at 2019-05-24T11:29:56Z [PS] Opérations sur balises non traduites - Closes #1292 - - - - - c4db9541 by tchemit at 2019-05-24T11:29:56Z update version - - - - - 49e6603e by tchemit at 2019-05-24T11:29:56Z [PS] Pb traduction Echantillon nespece accessoire - Closes #1295 - - - - - 8ad8783b by tchemit at 2019-05-24T11:29:56Z Fix some bugs on backup - - - - - 17c51847 by tchemit at 2019-05-24T12:42:24Z fix some i18n properties building + improve BeanFilterableComboBox init - - - - - 30 changed files: - − .gitlab/issue_templates/Contrat-AZTI-2017-Anomalie.md - − .gitlab/issue_templates/Contrat-AZTI-2017-Evolution.md - .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md - .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md - − .mvn/gitlab-cache/milestones/674086-issues.json - − .mvn/gitlab-cache/milestones/674086.json - + .mvn/gitlab-cache/milestones/761666-artifacts.json - .mvn/gitlab-cache/milestones/761666-issues.json - .mvn/gitlab-cache/milestones/761666.json - CHANGELOG.md - client-configuration/pom.xml - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/pom.xml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/backup/BackupsManager.java - client-core/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleDataUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/ChooseRelatedObservedActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/ActivityLonglinePairingTreeTable.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectTransmittingBuoyOperationUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java - client-core/src/main/java/fr/ird/observe/client/ui/util/treetable/BeanFilterableComboBoxCellEditor.java - client-runner/pom.xml - dto/pom.xml - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - observe-i18n/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/28f5fc72590c2de0b869081706… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/28f5fc72590c2de0b869081706… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [PS] Pb traduction Echantillon nespece accessoire - Closes #1295
by Tony CHEMIT 22 May '19

22 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 28f5fc72 by tchemit at 2019-05-22T15:56:19Z [PS] Pb traduction Echantillon nespece accessoire - Closes #1295 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUI.jcss Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUI.jaxx ===================================== @@ -90,9 +90,6 @@ public String getLengthDataTip(boolean computed) { return computed ? t(NonTargetSampleUIHandler.LONGUEUR_COMPUTED_TIP) : t(NonTargetSampleUIHandler.LONGUEUR_OBSERVED_TIP); } -public String getSpeciesFauneTypeTaille(SpeciesReference species) { - return species == null ? t(NonTargetSampleUIHandler.NO_SPECIES_SELECTED) : species.getSizeMeasureTypeId(); -} ]]> </script> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUI.jcss ===================================== @@ -20,11 +20,6 @@ * #L% */ -#sizeMeasureTypeLabel { - font-weight:"bold"; - text:{getSpeciesFauneTypeTaille(tableEditBean.getSpecies())}; -} - #hideFormInformation { text:"observe.common.NonTargetSampleDto.message.cantAdd"; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/28f5fc72590c2de0b8690817062… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/28f5fc72590c2de0b8690817062… You're receiving this email because of your account on gitlab.com.

1 0

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

22 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 590f128c by tchemit at 2019-05-22T15:18:24Z update version - - - - - 27 changed files: - − .gitlab/issue_templates/Contrat-AZTI-2017-Anomalie.md - − .gitlab/issue_templates/Contrat-AZTI-2017-Evolution.md - .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md - .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md - − .mvn/gitlab-cache/milestones/674086-issues.json - − .mvn/gitlab-cache/milestones/674086.json - + .mvn/gitlab-cache/milestones/761666-artifacts.json - .mvn/gitlab-cache/milestones/761666-issues.json - .mvn/gitlab-cache/milestones/761666.json - CHANGELOG.md - 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-validation/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== .gitlab/issue_templates/Contrat-AZTI-2017-Anomalie.md deleted ===================================== @@ -1,14 +0,0 @@ -## Quelle est la cause de bogue ? - -## Comment reproduire le bogue ? - -## Logs - -``` - -``` - -/label ~"Anomalie" -/label ~"Contrat AZTI-2017" -/milestone %"Contrat AZTI-2017" -/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-AZTI-2017-Evolution.md deleted ===================================== @@ -1,6 +0,0 @@ - - -/label ~"Evolution" -/label ~"Contrat AZTI-2017" -/milestone %"Contrat AZTI-2017" -/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md ===================================== @@ -10,5 +10,5 @@ /label ~"Anomalie" /label ~"IRD-2018-01-V8" -/milestone %"8.0-beta-1" +/milestone %"8.0-RC-1" /assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md ===================================== @@ -1,5 +1,5 @@ /label ~"Evolution" /label ~"IRD-2018-01-V8" -/milestone %"Contrat SFA-2017" +/milestone %"8.0-RC-1" /assign @tchemit \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/674086-issues.json deleted ===================================== @@ -1,719 +0,0 @@ -[ - { - "id": 18573039, - "iid": 1239, - "projectId": 2722779, - "title": "Improve select tree", - "description": "Add an undeterminated state icon as shown in below screenshot:\n\n![image](/uploads/9f86d633161669b1a725500556f2c3a7/image.png)\n\nPlus be able to use **Space** accelerator to select items in tree (this is the default behaviour to select in a tree); the **Enter** accelerator is kept.", - "labels": [ - "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": 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": "closed", - "updatedAt": "Feb 25, 2019 2:08:33 PM", - "createdAt": "Feb 25, 2019 1:57:21 PM", - "closedAt": "Feb 25, 2019 2:08:33 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1239" - }, - { - "id": 17565900, - "iid": 1200, - "projectId": 2722779, - "title": "Use Ctrl-Tab instead of Tab to select in a ComboBox", - "description": "Usage of Tab to select a item in a combo box does not work very well.", - "labels": [ - "Anomalie", - "IRD-2018-01-V8" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "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": "closed", - "updatedAt": "Jan 22, 2019 5:39:02 PM", - "createdAt": "Jan 22, 2019 3:08:53 PM", - "closedAt": "Jan 22, 2019 5:39:02 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1200" - }, - { - "id": 16573198, - "iid": 1185, - "projectId": 2722779, - "title": "[V8][DATA MODEL] Ajout de champs", - "description": "* Rajouter des homeid sur toutes les tables qui n\u0027en n\u0027ont pas. Cela facilitera le stockage des id des données historiques (dont nous traitons la migration) et les mises en correspondances.\n* Renommer observe_longline.activitylogbook.timestamp en starttimestamp et rajouter un endtimestamp (non obligatoire)", - "labels": [ - "Evolution", - "IRD-2018-01-V8", - "À facturer" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "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": 7, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "closed", - "updatedAt": "Dec 30, 2018 11:35:50 AM", - "createdAt": "Dec 11, 2018 1:51:50 PM", - "closedAt": "Dec 30, 2018 11:35:50 AM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1185" - }, - { - "id": 16239318, - "iid": 1182, - "projectId": 2722779, - "title": "Corrections dans le référentiel (requises pour migration FINSS)", - "description": "Corriger code pays :\r\n * Mauritanie : MOZ en MRT\r\n * Porto Rico : PT/PRT en PR/PRI\r\n\r\n```\r\nUPDATE observe_common.country SET iso2code \u003d \u0027MR\u0027, iso3code \u003d \u0027MRT\u0027 WHERE topiaid \u003d \u0027fr.ird.observe.entities.referentiel.Country#1464000000000#0.00054\u0027;\r\nUPDATE observe_common.country SET iso2code \u003d \u0027PR\u0027, iso3code \u003d \u0027PRI\u0027 WHERE topiaid \u003d \u0027fr.ird.observe.entities.referentiel.Country#1464000000000#0.00076\u0027;\r\n```\r\n\r\nTypes d\u0027activité bateau longline :\r\n```\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.01\u0027, 0, \u00272018-12-12\u0027, \u0027WAITING\u0027, 1, null, \u0027Waiting\u0027, \u0027En attente\u0027, \u0027Waiting #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.02\u0027, 0, \u00272018-12-12\u0027, \u0027SEINE_BACKDOWN\u0027, 1, null, \u0027Seine overturn\u0027, \u0027Chavirage de poche\u0027, \u0027Seine overturn #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.03\u0027, 0, \u00272018-12-12\u0027, \u0027HOVE\u0027, 1, null, \u0027Hoving toe\u0027, \u0027A la cape\u0027, \u0027Hoving toe #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.04\u0027, 0, \u00272018-12-12\u0027, \u0027FO_NEGATIVE\u0027, 1, null, \u0027Null set\u0027, \u0027Calée -\u0027, \u0027Null set #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.05\u0027, 0, \u00272018-12-12\u0027, \u0027FO_POSITIVE\u0027, 1, null, \u0027Positive set\u0027, \u0027Calée +\u0027, \u0027Positive set #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.06\u0027, 0, \u00272018-12-12\u0027, \u0027FO_UNKNOWN\u0027, 1, null, \u0027Unknown set\u0027, \u0027Calée ?\u0027, \u0027Unknown #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.07\u0027, 0, \u00272018-12-12\u0027, \u0027FOB_REMOVAL\u0027, 1, null, \u0027FOB removal\u0027, \u0027Retrait FOB\u0027, \u0027FOB removal #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.08\u0027, 0, \u00272018-12-12\u0027, \u0027FOB_DEPLOYMENT\u0027, 1, null, \u0027FOB deployment\u0027, \u0027Déploiement FOB\u0027, \u0027FOB deployment #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.09\u0027, 0, \u00272018-12-12\u0027, \u0027INACTIVE\u0027, 1, null, \u0027Inactive\u0027, \u0027Inconnue\u0027, \u0027Inactive #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.10\u0027, 0, \u00272018-12-12\u0027, \u0027LANDING\u0027, 1, null, \u0027Landing\u0027, \u0027Débarquement\u0027, \u0027Landing #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.11\u0027, 0, \u00272018-12-12\u0027, \u0027FO_HAULING\u0027, 1, null, \u0027Set hauling\u0027, \u0027Filage\u0027, \u0027Set hauling #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.12\u0027, 0, \u00272018-12-12\u0027, \u0027ONEDAYTRIP\u0027, 1, null, \u0027One day day trip\u0027, \u0027Marée mono journée\u0027, \u0027One day day trip #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.13\u0027, 0, \u00272018-12-12\u0027, \u0027OUT\u0027, 1, null, \u0027Vessel out fishing\u0027, \u0027Bateau en pêche\u0027, \u0027Vessel out fishing #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.14\u0027, 0, \u00272018-12-12\u0027, \u0027SEARCH\u0027, 1, null, \u0027Search\u0027, \u0027Recherche\u0027, \u0027Search #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\nINSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, code, status, \"uri\", label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate) VALUES (\u0027fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1464000000000#0.15\u0027, 0, \u00272018-12-12\u0027, \u0027TRANSIT\u0027, 1, null, \u0027Transit\u0027, \u0027Transit\u0027, \u0027Transit #TODO\u0027, null, null, null, null, null, \u0027f\u0027, \u00272018-12-12 17:00:00\u0027);\r\n\r\n```", - "labels": [ - "Evolution", - "IRD-2018-01-V8" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "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": 4, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "closed", - "updatedAt": "Jan 15, 2019 2:50:45 PM", - "createdAt": "Nov 30, 2018 12:34:38 PM", - "closedAt": "Jan 15, 2019 11:29:41 AM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1182" - }, - { - "id": 15852715, - "iid": 1172, - "projectId": 2722779, - "title": "Ajouter un générateur d\u0027id sur LL-Trip", - "description": "* Id Métier : Selon faisabilité. Ce champ est et doit rester alphanumérique. On aimerait toutefois rajouter à l\u0027extrémité droite un bouton qui permettre d\u0027auto générer, au besoin, un identifiant \"unique\" facilement lisible. L\u0027utilisation de ce bouton sera optionnel et il resterait possible d\u0027attribuer un id manuellement, alphanumérique. On pense :\n * aux générateurs d\u0027identifiants courts du type de ceux utilisés pour générer les URL abrégées : https://hashids.org/\n * aux générateurs utilisant un dictionnaire de nom et d\u0027adjectifs : https://www.npmjs.com/package/human-readable-ids", - "labels": [ - "Evolution", - "IRD-2018-01-V8", - "À facturer" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "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": "closed", - "updatedAt": "Dec 28, 2018 11:27:24 AM", - "createdAt": "Nov 14, 2018 6:20:47 PM", - "closedAt": "Dec 28, 2018 11:27:24 AM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1172" - }, - { - "id": 14727820, - "iid": 1130, - "projectId": 2722779, - "title": "[LL] Créer une liste d\u0027affichage d\u0027espèces propre aux captures, débarquements et échantillons LL Logbooks", - "description": "Créer une liste d\u0027affichage d\u0027espèces qui sera propre aux captures, débarquements et échantillons LL Logbooks (différente de la liste existante dédiée aux LL Observations).\n\nJuliette doit fournir la liste d\u0027espèces à y faire figurer.", - "labels": [ - "Evolution", - "IRD-2018-01-V8", - "À facturer" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "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": 10, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "closed", - "updatedAt": "Jan 15, 2019 11:29:41 AM", - "createdAt": "Oct 5, 2018 9:28:31 PM", - "closedAt": "Jan 15, 2019 11:29:41 AM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1130" - }, - { - "id": 14727558, - "iid": 1127, - "projectId": 2722779, - "title": "[LL] La position d\u0027activité devrait-elle est optionnelle ?", - "description": "Ce pourrait être nécessaires pour les activités hors ZEE, pour lesquelles les bateaux ne fournissent pas toujours les positions.\n\nCas en cours d\u0027investigation...", - "labels": [ - "IRD-2018-01-V8" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "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": "closed", - "updatedAt": "Jan 22, 2019 3:24:53 PM", - "createdAt": "Oct 5, 2018 9:08:48 PM", - "closedAt": "Jan 22, 2019 3:24:53 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1127" - }, - { - "id": 14715026, - "iid": 1122, - "projectId": 2722779, - "title": "[LL] Fournir le contenu de la table LL Compagnies destinataires des débarquements", - "description": "", - "labels": [ - "Evolution", - "IRD-2018-01-V8" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "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": 11, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "closed", - "updatedAt": "Jan 16, 2019 4:24:42 PM", - "createdAt": "Oct 5, 2018 1:31:54 PM", - "closedAt": "Jan 16, 2019 4:24:42 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1122" - }, - { - "id": 14310661, - "iid": 1066, - "projectId": 2722779, - "title": "Improve usage guis", - "description": "The current implementation is quite naive and is poor in term of performance, since it computes all references of any usage of the given referential.\nIn some case, for example for ``DataQuality`` this will be a huge amount of data, for... nothing, or nearly.\n\nI propose a new implementation which first just count usages by type, then in gui, we just display those counts, and if user wants to see usages for a given type, let just ask him to click on a button or select the required type.\nIn that way data are computed only when wanted by user and make the api much more lighter.\n\nIn term on gui design, I propose to use horizontal tab panned (on left) to represent all types of usages found and a unique list of references (on right) which contains the very usages for the selected. In that way we control perfectly the size of this gui and offer a better experience (see #1059).\n\n@pcauquil WDYT ?", - "labels": [ - "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": [], - "author": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "userNotesCount": 4, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "closed", - "updatedAt": "Feb 14, 2019 3:45:53 PM", - "createdAt": "Sep 19, 2018 10:29:02 PM", - "closedAt": "Feb 14, 2019 3:45:53 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1066" - }, - { - "id": 11953555, - "iid": 970, - "projectId": 2722779, - "title": "Mutualiser les topiaid t3 et ObServe", - "description": "On souhaiterait pouvoir ré utiliser des topiaid entre t3 et ObServe (notamment sur les références).\n\nActuellement c\u0027est impossible du fait du lien fort entre syntaxe du topiaid et classes des logiciels.\n\nJe vois deux options possibles :\n* permettre que le préfixe des topiaid soit indépendant des noms de classes de l\u0027application\n* utiliser un package Java commun pour les classes des deux logiciels", - "labels": [ - "Evolution", - "IRD-2018-01-V8", - "À facturer" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "assignees": [ - { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - } - ], - "assignee": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "author": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - }, - "userNotesCount": 2, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "closed", - "updatedAt": "Dec 16, 2018 1:03:10 PM", - "createdAt": "Jun 12, 2018 1:55:13 PM", - "closedAt": "Dec 14, 2018 12:49:58 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/970" - }, - { - "id": 9963535, - "iid": 918, - "projectId": 2722779, - "title": "Déplacement de groupes de données", - "description": "Comme cela a été évoqué précédemment dans ce document, il faut permettre, par clic droit, de\ndéplacer les groupes « données d’observation », « logbooks », « échantillons » d’une marée à l’autre.\n\nExactement comme l’on peut, actuellement, déplacer une marée de programme par le menu contextuel. \n\nCeci entraînera nécessairement la perte des appariements entre activités d’observation et\nlogbooks s’il y en avait. Par contre on fera suivre si possible les champs de la table Activité relatifs à\nces groupes (données des onglets Caractéristiques d’observation et Caractéristiques logbooks).\n\nLes déplacements possibles seront :\n * Déplacer le logbook d’une marée vers une autre\n * Déplacer les débarquements d’une marée vers une autre\n * Déplacer les échantillons :\n * de la racine de la marée vers une opération de pêche (de la même marée ou d’une autre)\n * d’une opération de pêche vers la racine de la marée (ou d’une autre marée)\n * d’une opération de pêche vers une autre opération de pêche (de la même marée ou d’un autre)", - "labels": [ - "Evolution", - "IRD-2018-01-V8" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "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": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "userNotesCount": 5, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "opened", - "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" - }, - { - "id": 9962937, - "iid": 915, - "projectId": 2722779, - "title": "Ajout de règles de validation de niveau 1", - "description": "On trouve des éléments de démarrage pour ce sujet dans :\n * Dans le manuel Industrial Fishery de FINNS version allégée SFA, p73+, la liste des contrôles\nactuellement assurés par FINNS et par les requêtes propres à la SFA sur les données LL\nindustrielles.\n * Dans le manuel Semi Industrial Fishery de FINNS version allégée SFA, p26+, la liste des\ncontrôles actuellement assurés par FINNS et par les requêtes propres à la SFA sur les données\nLL semi industrielles.\n\n# Liste des nouveaux contrôles à implanter :\n * *[Erreur]* Check that Departure Date is earlier than Arrival Date of the trip and that both dates are earlier than today.\n * *[Erreur]* Check that trip departure/arrival dates do not overlap with another trip for the same vessel (à implanter sur tous les types de marées).\n * *[Erreur]* Check that the Event Start Date is less than the Event End Date (A implanter sur le formulaire opération de pêche (qui recèle 4 dates/heures) : il faut date début filage \u003c fin filage \u003c début virage \u003c fin virage)\n * *[Erreur]* Check that dates for the event (activity) are inside the start/end date/ time of the trip\n * *[Warning]* Check for Null positions, for latitude that is exactly 0 or 90 and for longitude that is exactly 0 or 180\n * *[Erreur]* Si elles sont renseignées, position d’activité et première position de pêche (début du filage) doivent être identiques\n * *[Erreur]* Check for number of hooks \u003c500 and number of hooks\u003e 5500\n * *[Warning]* Check if the SST is \u003c15\n * *[Erreur]* Check if the SST is \u003e35\n * *[Erreur]* Check whereas the fish is either too big or too small for a given species (Utiliser les bornes définies dans le référentiel Species)\n\n# Liste des contrôles demandés mais déjà implantés :\n * *[Erreur]* Check that the trip type is valid for current gears of the vessel. That is the vessel to which a longline trip is being added has its gear type set to industrial longliners.\n\nLa liste des bateaux proposés sur les formulaires est filtrée selon leur type. Pas d’erreur possible\n\n * *[Erreur]* Check for negative values in catch, discard, lost or retained weights and pieces\n\nOn interdit déjà les valeurs négatives.\n\n * *[Erreur]* Check that new trip type selected is associated with longline data\n\nLe type de marée est piloté par le programme dans lequel elle est créée, de même que la nature des formulaires (PS ou LL). Pas d’erreur possible.\n\n * *[Erreur]* If species have been classified, check that selected species in trip catches is either a target or a bycatch class\n\nLa liste d’espèces proposée dans le formulaire capture est déjà filtrée et ne propose que les espèces pertinentes. Pas d’erreur possible.\n\n * *[Erreur]* If species have been classified, check that selected species is a bait class for species recorded as bait.\n\nLa liste d’espèces proposées comme appât provient de la table appâts et ne propose que les espèces pertinentes. Pas d’erreur possible.\n\n * *[Erreur]* Check that the event is valid for the trip type (only if the trip type has definition of allowed events\n\nLa liste des activités dans ObServe est propre à un type d’engin. Pas d’erreur possible.\n\n * *[Erreur]* If new event is not a fishing activity, then it makes sure that there are no catches associated to this record, e.g. in port event\n\nL’UI d’ObServe n’autorisera la saisie de captures que sur le type opération de pêche. Pas d’erreur possible.\n\n * *[Erreur]* Check for negative values in oceanography\n\nOn interdit déjà les valeurs négatives.\n\n * *[Erreur]* Check that the total percentage of the lost catch is not greater than 100.00\n\nContrôle déjà actif.", - "labels": [ - "Evolution", - "IRD-2018-01-V8" - ], - "milestone": { - "id": 674086, - "iid": 128, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-alpha-5", - "description": "", - "dueDate": "Nov 4, 2018 1:00:00 AM", - "startDate": "Oct 21, 2018 2:00:00 AM", - "state": "active" - }, - "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": 1, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "closed", - "updatedAt": "Jan 27, 2019 3:07:52 AM", - "createdAt": "Mar 27, 2018 3:13:54 PM", - "closedAt": "Jan 27, 2019 3:07:52 AM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/915" - } -] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/674086.json deleted ===================================== @@ -1,11 +0,0 @@ -{ - "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" -} \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/761666-artifacts.json ===================================== @@ -0,0 +1,12 @@ +[ + { + "name": "Application", + "filename": "observe-8.0-RC-1-SNAPSHOT.zip", + "url": "https://ultreia.io/release/observe-8.0-RC-1-SNAPSHOT.zip" + }, + { + "name": "Serveur", + "filename": "observe-8.0-RC-1-SNAPSHOT.war", + "url": "https://ultreia.io/release/observe-8.0-RC-1-SNAPSHOT.war" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/761666-issues.json ===================================== The diff for this file was not included because it is too large. ===================================== .mvn/gitlab-cache/milestones/761666.json ===================================== @@ -3,9 +3,9 @@ "iid": 133, "projectId": 2722779, "groupId": 0, - "title": "8.0-beta-1", + "title": "8.0-RC-1", "description": "", - "dueDate": "Feb 3, 2019 1:00:00 AM", + "dueDate": "May 31, 2019 2:00:00 AM", "startDate": "Jan 21, 2019 1: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-05-14 00:13. + * Last generated at 2019-05-22 17:16. ## 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. ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-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>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-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>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-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>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services-validation/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>8.0-RC-1-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/590f128cdbf128a2074b318319d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/590f128cdbf128a2074b318319d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [PS] Opérations sur balises non traduites - Closes #1292
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4c829afd by tchemit at 2019-05-21T16:34:47Z [PS] Opérations sur balises non traduites - Closes #1292 - - - - - 2 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectTransmittingBuoyOperationUI.jcss Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -782,6 +782,7 @@ observe.common.TdrObsDto.speciesTab observe.common.TdrObsDto.timestampTab observe.common.TdrObsDto.title observe.common.TransmittingBuoyDto.brand +observe.common.TransmittingBuoyDto.code observe.common.TransmittingBuoyDto.noBuoy observe.common.TransmittingBuoyDto.ownership observe.common.TransmittingBuoyDto.title ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectTransmittingBuoyOperationUI.jcss ===================================== @@ -40,7 +40,7 @@ } #transmittingBuoyOperation1Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION}; + i18nProperty:transmittingBuoyOperation; } #transmittingBuoyOperation1 { @@ -50,7 +50,7 @@ } #transmittingBuoyType1Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE}; + i18nProperty:transmittingBuoyOperation; } #transmittingBuoyType1 { @@ -59,7 +59,7 @@ } #ownership1Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_OWNERSHIP}; + i18nProperty:ownership; } #ownership1 { @@ -67,8 +67,8 @@ enabled: {!getHandler().isBalisePose(transmittingBuoy1.getTransmittingBuoyOperation())} } -#country1Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_COUNTRY}; +#country1Label { + i18nProperty:country; } #country1 { @@ -77,7 +77,7 @@ } #code1Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_CODE}; + i18nProperty:code; } #code1 { @@ -86,7 +86,7 @@ } #brand1Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_BRAND}; + i18nProperty:brand; } #brand1 { @@ -95,7 +95,7 @@ } #transmittingBuoyOperation2Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION}; + i18nProperty:transmittingBuoyOperation; } #transmittingBuoyOperation2 { @@ -105,7 +105,7 @@ } #transmittingBuoyType2Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE}; + i18nProperty:transmittingBuoyType; } #transmittingBuoyType2 { @@ -114,7 +114,7 @@ } #ownership2Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_OWNERSHIP}; + i18nProperty:ownership; } #ownership2 { @@ -123,7 +123,7 @@ } #country2Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_COUNTRY}; + i18nProperty:country; } #country2 { @@ -132,7 +132,7 @@ } #code2Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_CODE}; + i18nProperty:code; } #code2 { @@ -141,7 +141,7 @@ } #brand2Label { - i18nProperty:{TransmittingBuoyDto.PROPERTY_BRAND}; + i18nProperty:brand; } #brand2 { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4c829afddd09026eb79bfa4219e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4c829afddd09026eb79bfa4219e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] pb traduction pop up activité observée associée - Closes #1289
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: be2ea0d2 by tchemit at 2019-05-21T16:02:41Z pb traduction pop up activité observée associée - Closes #1289 - - - - - 9 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingConfigUI.jcss - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - services/src/main/i18n/getters/java.getter - services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingResultItem.java - services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingResultItemDecorator.java Changes: ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -999,6 +999,7 @@ observe.ui.tree.longline.encounter observe.ui.tree.longline.logbook.activity.list observe.ui.tree.longline.logbook.activity.unsaved observe.ui.tree.longline.logbook.landing.list +observe.ui.tree.longline.logbook.landing.unsaved observe.ui.tree.longline.logbook.sample.list observe.ui.tree.longline.logbook.sample.unsaved observe.ui.tree.longline.logbook.set.unsaved ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -100,10 +100,6 @@ observe.common.ActivityLonglineObsDto.timeStamp observe.common.ActivityLonglineObsDto.title observe.common.ActivityLonglineObsDto.titles observe.common.ActivityLonglineObsDto.vesselActivityLongline -observe.common.ActivityLonglinePairingResultItemDto.computedDistance -observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue -observe.common.ActivityLonglinePairingResultItemDto.computedTime -observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue observe.common.ActivitySeineDto.availableObservedSystem observe.common.ActivitySeineDto.comment observe.common.ActivitySeineDto.coordinate @@ -899,6 +895,10 @@ observe.common.WithFormula.coefficientsInformation observe.common.WithFormula.equation observe.common.WithFormula.source observe.common.acquisitionMode +observe.common.activityLonglinePairingResultItem.computedDistance +observe.common.activityLonglinePairingResultItem.computedDistanceValue +observe.common.activityLonglinePairingResultItem.computedTime +observe.common.activityLonglinePairingResultItem.computedTimeValue observe.common.description observe.common.directory observe.common.file ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingConfigUI.jcss ===================================== @@ -25,7 +25,7 @@ } #longlineActivityPairingMaxTimeLabel { - text:"observe.common.ActivityLonglinePairingResultItemDto.computedTime"; + text:"observe.common.activityLonglinePairingResultItem.computedTime"; } #longlineActivityPairingMaxTime { @@ -35,7 +35,7 @@ } #longlineActivityPairingMaxDistanceLabel { - text:"observe.common.ActivityLonglinePairingResultItemDto.computedDistance"; + text:"observe.common.activityLonglinePairingResultItem.computedDistance"; } #longlineActivityPairingMaxDistance { ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -465,12 +465,6 @@ observe.common.ActivityLonglineObsDto.types=Activities observe.common.ActivityLonglineObsDto.vesselActivityLongline=Vessel activity observe.common.ActivityLonglineObsEncounterDto.comment=Comment observe.common.ActivityLonglineObsSensorUsedDto.comment=Comment -observe.common.ActivityLonglinePairingResultItemDto.computedDistance=Distance (km) -observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue=Distance (%s kms) -observe.common.ActivityLonglinePairingResultItemDto.computedTime=Time (minutes) -observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue=Time (%s minutes) -observe.common.ActivityLonglinePairingResultItemDto.observationActivity=Observed activity -observe.common.ActivityLonglinePairingResultItemDto.type=Observed activity observe.common.ActivityObsDto.action.goToOpen.short=Observations - Open activity observe.common.ActivityObsDto.action.goToOpen.tip=Go to open activity (Observations) observe.common.ActivitySeineDto.action.addFloatingObject=Add FAD @@ -2570,6 +2564,12 @@ observe.common.action.selectFirst.tip=Select first entry observe.common.action.selectLast.tip=Select last entry observe.common.action.selectNext.tip=Select next entry observe.common.action.selectPrevious.tip=Select previous entry +observe.common.activityLonglinePairingResultItem=Observed activity +observe.common.activityLonglinePairingResultItem.computedDistance=Distance (km) +observe.common.activityLonglinePairingResultItem.computedDistanceValue=Distance (%s kms) +observe.common.activityLonglinePairingResultItem.computedTime=Time (minutes) +observe.common.activityLonglinePairingResultItem.computedTimeValue=Time (%s minutes) +observe.common.activityLonglinePairingResultItem.observationActivity=Observed activity observe.common.boolean.false=No observe.common.boolean.null=Undefined observe.common.boolean.true=Yes ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -465,12 +465,6 @@ observe.common.ActivityLonglineObsDto.types=Actividades observe.common.ActivityLonglineObsDto.vesselActivityLongline=Actividad barco observe.common.ActivityLonglineObsEncounterDto.comment=Comentarios observe.common.ActivityLonglineObsSensorUsedDto.comment=Comentarios -observe.common.ActivityLonglinePairingResultItemDto.computedDistance=Distance (km) \#TODO -observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue=Distance (%s kms) \#TODO -observe.common.ActivityLonglinePairingResultItemDto.computedTime=Time (minutes) \#TODO -observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue=Time (%s minutes) \#TODO -observe.common.ActivityLonglinePairingResultItemDto.observationActivity=Observed activity \#TODO -observe.common.ActivityLonglinePairingResultItemDto.type=Observed activity \#TODO observe.common.ActivityObsDto.action.goToOpen.short=Observations - Open activity \#TODO observe.common.ActivityObsDto.action.goToOpen.tip=Go to open activity (Observations) \#TODO observe.common.ActivitySeineDto.action.addFloatingObject=Añadir un FOB @@ -2570,6 +2564,12 @@ observe.common.action.selectFirst.tip=Select first entry observe.common.action.selectLast.tip=Select last entry observe.common.action.selectNext.tip=Select next entry observe.common.action.selectPrevious.tip=Select previous entry +observe.common.activityLonglinePairingResultItem=Observed activity \#TODO +observe.common.activityLonglinePairingResultItem.computedDistance=Distance (km) \#TODO +observe.common.activityLonglinePairingResultItem.computedDistanceValue=Distance (%s kms) \#TODO +observe.common.activityLonglinePairingResultItem.computedTime=Time (minutes) \#TODO +observe.common.activityLonglinePairingResultItem.computedTimeValue=Time (%s minutes) \#TODO +observe.common.activityLonglinePairingResultItem.observationActivity=Observed activity \#TODO observe.common.boolean.false=No observe.common.boolean.null=Indeterminado observe.common.boolean.true=Si ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -465,12 +465,6 @@ observe.common.ActivityLonglineObsDto.types=Activités observe.common.ActivityLonglineObsDto.vesselActivityLongline=Activité bateau observe.common.ActivityLonglineObsEncounterDto.comment=Commentaire observe.common.ActivityLonglineObsSensorUsedDto.comment=Commentaire -observe.common.ActivityLonglinePairingResultItemDto.computedDistance=Distance (km) -observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue=Distance (%s kms) -observe.common.ActivityLonglinePairingResultItemDto.computedTime=Temps (minutes) -observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue=Temps (%s minutes) -observe.common.ActivityLonglinePairingResultItemDto.observationActivity=Activité observée -observe.common.ActivityLonglinePairingResultItemDto.type=Activité observée observe.common.ActivityObsDto.action.goToOpen.short=Observations - Activité ouverte observe.common.ActivityObsDto.action.goToOpen.tip=Accéder à l'activité ouverte (Observations) observe.common.ActivitySeineDto.action.addFloatingObject=Ajouter un DCP @@ -2570,6 +2564,12 @@ observe.common.action.selectFirst.tip=Sélectionner la première entrée observe.common.action.selectLast.tip=Sélectionner la dernière entrée observe.common.action.selectNext.tip=Sélectionner l'entrée suivante observe.common.action.selectPrevious.tip=Sélectionner l'entrée précédente +observe.common.activityLonglinePairingResultItem=Activité observée +observe.common.activityLonglinePairingResultItem.computedDistance=Distance (km) +observe.common.activityLonglinePairingResultItem.computedDistanceValue=Distance (%s kms) +observe.common.activityLonglinePairingResultItem.computedTime=Temps (minutes) +observe.common.activityLonglinePairingResultItem.computedTimeValue=Temps (%s minutes) +observe.common.activityLonglinePairingResultItem.observationActivity=Activité observée observe.common.boolean.false=Non observe.common.boolean.null=Indéterminé observe.common.boolean.true=Oui ===================================== services/src/main/i18n/getters/java.getter ===================================== @@ -1,6 +1,6 @@ -observe.common.ActivityLonglinePairingResultItemDto.computedDistance -observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue -observe.common.ActivityLonglinePairingResultItemDto.computedTime -observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue -observe.common.ActivityLonglinePairingResultItemDto.observationActivity -observe.common.ActivityLonglinePairingResultItemDto.type +observe.common.activityLonglinePairingResultItem +observe.common.activityLonglinePairingResultItem.computedDistance +observe.common.activityLonglinePairingResultItem.computedDistanceValue +observe.common.activityLonglinePairingResultItem.computedTime +observe.common.activityLonglinePairingResultItem.computedTimeValue +observe.common.activityLonglinePairingResultItem.observationActivity ===================================== services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingResultItem.java ===================================== @@ -28,6 +28,8 @@ import io.ultreia.java4all.lang.Numbers; import java.util.Objects; +import static io.ultreia.java4all.i18n.I18n.n; + /** * Created by tchemit on 15/10/2018. * @@ -35,6 +37,10 @@ import java.util.Objects; */ public class ActivityLonglinePairingResultItem implements ObserveDto { + static { + n("observe.common.activityLonglinePairingResultItem"); + + } private final ActivityLonglineObsReference observationActivity; private final long computedTime; private final double computedDistance; ===================================== services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingResultItemDecorator.java ===================================== @@ -41,10 +41,10 @@ import static io.ultreia.java4all.i18n.I18n.n; public class ActivityLonglinePairingResultItemDecorator extends ObserveDecorator<ActivityLonglinePairingResultItem> { static { - n("observe.common.ActivityLonglinePairingResultItemDto.type"); - n("observe.common.ActivityLonglinePairingResultItemDto.observationActivity"); - n("observe.common.ActivityLonglinePairingResultItemDto.computedTime"); - n("observe.common.ActivityLonglinePairingResultItemDto.computedDistance"); + n("observe.common.activityLonglinePairingResultItem"); + n("observe.common.activityLonglinePairingResultItem.observationActivity"); + n("observe.common.activityLonglinePairingResultItem.computedTime"); + n("observe.common.activityLonglinePairingResultItem.computedDistance"); } private final Locale locale; @@ -62,9 +62,9 @@ public class ActivityLonglinePairingResultItemDecorator extends ObserveDecorator Object value0 = jxcontext.getValue(token); switch (token) { case "computedTime": - return (Comparable) l(locale, "observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue", value0); + return (Comparable) l(locale, "observe.common.activityLonglinePairingResultItem.computedTimeValue", value0); case "computedDistance": - return (Comparable) l(locale, "observe.common.ActivityLonglinePairingResultItemDto.computedDistanceValue", value0); + return (Comparable) l(locale, "observe.common.activityLonglinePairingResultItem.computedDistanceValue", value0); case "observationActivity": return (Comparable) activityDecorator.toString(value0); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/be2ea0d2b81eee06774fc64a372… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/be2ea0d2b81eee06774fc64a372… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Pb arbre de navigation - traduction - débarquement/échantillon - Closes #1291
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ceb112a8 by tchemit at 2019-05-21T15:32:56Z Pb arbre de navigation - traduction - débarquement/échantillon - Closes #1291 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/TripLonglineLandingLogbookNavigationTreeNode.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/TripLonglineLandingLogbookNavigationTreeNode.java ===================================== @@ -60,7 +60,7 @@ public class TripLonglineLandingLogbookNavigationTreeNode extends ReferenceNavig @Override public String getText() { - return isPersisted() ? super.getText() : t("observe.ui.tree.longline.logbook.sample.unsaved"); + return isPersisted() ? super.getText() : t("observe.ui.tree.longline.logbook.landing.unsaved"); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ceb112a81daa6a577e26c8dfdf6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ceb112a81daa6a577e26c8dfdf6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Diverses corrections sur le modèle LL
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 45fb2003 by tchemit at 2019-05-21T13:47:53Z Diverses corrections sur le modèle LL - - - - - 14 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/CommonTable.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineObsUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/TdrObsUI.jcss - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - services-client/src/test/java/fr/ird/observe/services/client/service/actions/validate/ValidateServiceClientTest.java - services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -714,6 +714,8 @@ 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.targetDiscardCatchCompositionEstimatedByObserver observe.common.TargetCatchDto.title observe.common.TargetCatchDto.weightCategory observe.common.TargetCatchDto.well ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/CommonTable.jcss ===================================== @@ -34,6 +34,10 @@ JButton { _protectFocus:true; } +BeanCheckBox { + i18nProperty:"" +} + /*#comment { minimumSize:{new Dimension(10,50)}; }*/ ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineObsUI.jaxx ===================================== @@ -120,7 +120,7 @@ public void edit(BranchlineObsDto branchline) { getHandler().edit(branchline); } <JLabel id='timeSinceContactLabel'/> </cell> <cell> - <TimeEditor id='timeSinceContact' constructorParams='this'/> + <TimeEditor id='timeSinceContact' constructorParams='this' beanScope="model"/> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineObsUIModel.java ===================================== @@ -24,6 +24,9 @@ package fr.ird.observe.client.ui.content.data.ll.observation; import fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUIModel; import fr.ird.observe.dto.data.ll.observation.BranchlineObsDto; +import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.bean.definition.JavaBeanDefinition; +import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; import java.util.Date; @@ -33,7 +36,8 @@ import java.util.Date; * @author Tony Chemit - dev(a)tchemit.fr * @since 3.10 */ -public class BranchlineObsUIModel extends ContentSimpleUIModel<BranchlineObsDto> { +@GenerateJavaBeanDefinition +public class BranchlineObsUIModel extends ContentSimpleUIModel<BranchlineObsDto> implements JavaBean { public static final String PROPERTY_SAVED = "saved"; private static final long serialVersionUID = 1L; @@ -68,4 +72,16 @@ public class BranchlineObsUIModel extends ContentSimpleUIModel<BranchlineObsDto> firePropertyChange(PROPERTY_SAVED, null, true); } + + /** + * Lazy helper class that manages all java bean operations. + * + * @see #javaBeanDefinition() + */ + private transient final JavaBeanDefinition javaBeanDefinition = new LonglineDetailCompositionObsUIModelJavaBeanDefinition(); + + @Override + public JavaBeanDefinition javaBeanDefinition() { + return null; + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUI.jaxx ===================================== @@ -281,7 +281,7 @@  <row> <cell anchor='west' fill="both"> - <BeanCheckBox id='depredated'/> + <BeanCheckBox id='depredated' /> </cell> </row> @@ -397,10 +397,10 @@ <cell anchor='east'> <BeanCheckBox id='timer'/> </cell> - <cell> - <JLabel id='timeSinceContactLabel'/> - </cell> - <cell> + + + + <cell columns="2"> <TimeEditor id='timeSinceContact' constructorParams='this' beanScope="model"/> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIHandler.java ===================================== @@ -503,7 +503,7 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline CatchLonglineObsUIModel model = getModel(); if (BooleanUtils.isTrue(branchline.getTimer())) { Calendar calendar = Calendar.getInstance(); - calendar.setTime(model.getTimeSinceContact()); + calendar. setTime(model.getTimeSinceContact()); int minutes = calendar.get(Calendar.MINUTE); int hours = calendar.get(Calendar.HOUR); branchline.setTimeSinceContact(minutes + 60L * hours); @@ -642,7 +642,7 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline } private void onCatchFateChanged(CatchFateLonglineReference newValue) { - if (newValue == null || !" fr.ird.referential.ll.common.CatchFateLongline#1239832686125#0.3".equals(newValue.getId())) { + if (newValue == null || !"fr.ird.referential.ll.common.CatchFateLongline#1239832686125#0.3".equals(newValue.getId())) { // not discarded ui.getDiscardHealthness().setEnabled(false); ui.getHookWhenDiscarded().setEnabled(false); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jaxx ===================================== @@ -112,7 +112,7 @@  <row> <cell anchor='west' fill="both"> - <BeanCheckBox id='canGenerate'/> + <BeanCheckBox id='canGenerate' beanScope="model"/> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIModel.java ===================================== @@ -24,6 +24,9 @@ package fr.ird.observe.client.ui.content.data.ll.observation; import fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUIModel; import fr.ird.observe.dto.data.ll.observation.SetLonglineObsDetailCompositionDto; +import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.bean.definition.JavaBeanDefinition; +import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; /** * Created on 12/5/14. @@ -32,7 +35,8 @@ import fr.ird.observe.dto.data.ll.observation.SetLonglineObsDetailCompositionDto * @since 3.8 */ @SuppressWarnings("WeakerAccess") -public class LonglineDetailCompositionObsUIModel extends ContentSimpleUIModel<SetLonglineObsDetailCompositionDto> { +@GenerateJavaBeanDefinition +public class LonglineDetailCompositionObsUIModel extends ContentSimpleUIModel<SetLonglineObsDetailCompositionDto> implements JavaBean { public static final String PROPERTY_CAN_GENERATE = "canGenerate"; @@ -130,4 +134,15 @@ public class LonglineDetailCompositionObsUIModel extends ContentSimpleUIModel<Se firePropertyChange(PROPERTY_GENERATE_TAB_VALID, null, generateTabValid); } + /** + * Lazy helper class that manages all java bean operations. + * + * @see #javaBeanDefinition() + */ + private transient final JavaBeanDefinition javaBeanDefinition = new LonglineDetailCompositionObsUIModelJavaBeanDefinition(); + + @Override + public JavaBeanDefinition javaBeanDefinition() { + return javaBeanDefinition; + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/TdrObsUI.jcss ===================================== @@ -74,6 +74,7 @@ #enableTimestamp { toolTipText:"observe.common.TdrObsDto.enableTimestamp.tip"; + _skipBindingToBean:true; } #timestampPanel { ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1997,8 +1997,6 @@ observe.common.SetLonglineObsDto.shooterSpeed=Shooter speed (kts) observe.common.SetLonglineObsDto.shooterUsed=Shooter used observe.common.SetLonglineObsDto.snapWeight=Snap weight (kg) observe.common.SetLonglineObsDto.swivelWeight=swivel weight (kg) -observe.common.SetLonglineObsDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer? -observe.common.SetLonglineObsDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.SetLonglineObsDto.timeBetweenHooks=time between hooks observe.common.SetLonglineObsDto.title=Fishing operation observe.common.SetLonglineObsDto.totalBasketsCount=Total baskets count @@ -2147,6 +2145,8 @@ 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.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.TargetCatchDto.title=Target catch observe.common.TargetCatchDto.type=Target catch observe.common.TargetCatchDto.types=Target catches ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1997,8 +1997,6 @@ observe.common.SetLonglineObsDto.shooterSpeed=Velocidad shooter (nd) observe.common.SetLonglineObsDto.shooterUsed=Shooter used \#TODO observe.common.SetLonglineObsDto.snapWeight=Peso snap (kg) observe.common.SetLonglineObsDto.swivelWeight=Peso de el destorcedor (kg) -observe.common.SetLonglineObsDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? \#TODO -observe.common.SetLonglineObsDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? \#TODO observe.common.SetLonglineObsDto.timeBetweenHooks=Temps entre anzuelos (s) observe.common.SetLonglineObsDto.title=Operación de pesca observe.common.SetLonglineObsDto.totalBasketsCount=Número total de baskets @@ -2147,6 +2145,8 @@ observe.common.TargetCatchDto.table.weightCategory=Categoría de peso observe.common.TargetCatchDto.table.weightCategory.tip=Categoría de peso observe.common.TargetCatchDto.table.well=Tanque observe.common.TargetCatchDto.table.well.tip=Tanque +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? \#TODO +observe.common.TargetCatchDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? \#TODO observe.common.TargetCatchDto.title=Captura de atún observe.common.TargetCatchDto.type=Captura destinataria observe.common.TargetCatchDto.types=Capturas destinatarias ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1997,8 +1997,6 @@ observe.common.SetLonglineObsDto.shooterSpeed=Vitesse shooter (nd) observe.common.SetLonglineObsDto.shooterUsed=Utilisation du shooter observe.common.SetLonglineObsDto.snapWeight=Poids snap (kg) observe.common.SetLonglineObsDto.swivelWeight=Poids de l'émerillon (kg) -observe.common.SetLonglineObsDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? -observe.common.SetLonglineObsDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.SetLonglineObsDto.timeBetweenHooks=Temps entre hameçons (s) observe.common.SetLonglineObsDto.title=Opération de pêche observe.common.SetLonglineObsDto.totalBasketsCount=Nombre total de paniers @@ -2147,6 +2145,8 @@ 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.targetDiscardCatchCompositionEstimatedByObserver=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 ===================================== services-client/src/test/java/fr/ird/observe/services/client/service/actions/validate/ValidateServiceClientTest.java ===================================== @@ -180,7 +180,7 @@ public class ValidateServiceClientTest extends ServiceClientTestSupport { request.setDataIds(ImmutableSet.of(ObserveFixtures.TRIP_SEINE_ID_1, ObserveFixtures.TRIP_SEINE_ID_2)); SeineBycatchObservedSystemConfig seineBycatchObservedSystemConfig = new SeineBycatchObservedSystemConfig(); ArrayListMultimap<String, String> data = ArrayListMultimap.create(); - data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", " fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); + data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", "fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); seineBycatchObservedSystemConfig.setData(data); request.setSeineBycatchObservedSystemConfig(seineBycatchObservedSystemConfig); @@ -210,7 +210,7 @@ public class ValidateServiceClientTest extends ServiceClientTestSupport { SeineBycatchObservedSystemConfig seineBycatchObservedSystemConfig = new SeineBycatchObservedSystemConfig(); ArrayListMultimap<String, String> data = ArrayListMultimap.create(); - data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", " fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); + data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", "fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); seineBycatchObservedSystemConfig.setData(data); request.setSeineBycatchObservedSystemConfig(seineBycatchObservedSystemConfig); ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java ===================================== @@ -96,7 +96,7 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport { request.setValidationContext(ValidationContext.UPDATE_VALIDATION_CONTEXT); SeineBycatchObservedSystemConfig seineBycatchObservedSystemConfig = new SeineBycatchObservedSystemConfig(); ArrayListMultimap<String, String> data = ArrayListMultimap.create(); - data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", " fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); + data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", "fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); seineBycatchObservedSystemConfig.setData(data); request.setSeineBycatchObservedSystemConfig(seineBycatchObservedSystemConfig); request.setScopes(ImmutableSet.copyOf(NuitonValidatorScope.values())); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/45fb2003593810eb04965d053e7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/45fb2003593810eb04965d053e7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Diverses corrections sur le modèle LL
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9316f9c6 by tchemit at 2019-05-21T13:33:52Z Diverses corrections sur le modèle LL - - - - - 11 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/CommonTable.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineObsUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/TdrObsUI.jcss - services-client/src/test/java/fr/ird/observe/services/client/service/actions/validate/ValidateServiceClientTest.java - services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -714,6 +714,8 @@ 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.targetDiscardCatchCompositionEstimatedByObserver observe.common.TargetCatchDto.title observe.common.TargetCatchDto.weightCategory observe.common.TargetCatchDto.well ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/CommonTable.jcss ===================================== @@ -34,6 +34,10 @@ JButton { _protectFocus:true; } +BeanCheckBox { + i18nProperty:"" +} + /*#comment { minimumSize:{new Dimension(10,50)}; }*/ ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineObsUI.jaxx ===================================== @@ -120,7 +120,7 @@ public void edit(BranchlineObsDto branchline) { getHandler().edit(branchline); } <JLabel id='timeSinceContactLabel'/> </cell> <cell> - <TimeEditor id='timeSinceContact' constructorParams='this'/> + <TimeEditor id='timeSinceContact' constructorParams='this' beanScope="model"/> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineObsUIModel.java ===================================== @@ -24,6 +24,9 @@ package fr.ird.observe.client.ui.content.data.ll.observation; import fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUIModel; import fr.ird.observe.dto.data.ll.observation.BranchlineObsDto; +import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.bean.definition.JavaBeanDefinition; +import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; import java.util.Date; @@ -33,7 +36,8 @@ import java.util.Date; * @author Tony Chemit - dev(a)tchemit.fr * @since 3.10 */ -public class BranchlineObsUIModel extends ContentSimpleUIModel<BranchlineObsDto> { +@GenerateJavaBeanDefinition +public class BranchlineObsUIModel extends ContentSimpleUIModel<BranchlineObsDto> implements JavaBean { public static final String PROPERTY_SAVED = "saved"; private static final long serialVersionUID = 1L; @@ -68,4 +72,16 @@ public class BranchlineObsUIModel extends ContentSimpleUIModel<BranchlineObsDto> firePropertyChange(PROPERTY_SAVED, null, true); } + + /** + * Lazy helper class that manages all java bean operations. + * + * @see #javaBeanDefinition() + */ + private transient final JavaBeanDefinition javaBeanDefinition = new LonglineDetailCompositionObsUIModelJavaBeanDefinition(); + + @Override + public JavaBeanDefinition javaBeanDefinition() { + return null; + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUI.jaxx ===================================== @@ -281,7 +281,7 @@  <row> <cell anchor='west' fill="both"> - <BeanCheckBox id='depredated'/> + <BeanCheckBox id='depredated' /> </cell> </row> @@ -397,10 +397,10 @@ <cell anchor='east'> <BeanCheckBox id='timer'/> </cell> - <cell> - <JLabel id='timeSinceContactLabel'/> - </cell> - <cell> + + + + <cell columns="2"> <TimeEditor id='timeSinceContact' constructorParams='this' beanScope="model"/> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIHandler.java ===================================== @@ -503,7 +503,7 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline CatchLonglineObsUIModel model = getModel(); if (BooleanUtils.isTrue(branchline.getTimer())) { Calendar calendar = Calendar.getInstance(); - calendar.setTime(model.getTimeSinceContact()); + calendar. setTime(model.getTimeSinceContact()); int minutes = calendar.get(Calendar.MINUTE); int hours = calendar.get(Calendar.HOUR); branchline.setTimeSinceContact(minutes + 60L * hours); @@ -642,7 +642,7 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline } private void onCatchFateChanged(CatchFateLonglineReference newValue) { - if (newValue == null || !" fr.ird.referential.ll.common.CatchFateLongline#1239832686125#0.3".equals(newValue.getId())) { + if (newValue == null || !"fr.ird.referential.ll.common.CatchFateLongline#1239832686125#0.3".equals(newValue.getId())) { // not discarded ui.getDiscardHealthness().setEnabled(false); ui.getHookWhenDiscarded().setEnabled(false); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jaxx ===================================== @@ -112,7 +112,7 @@  <row> <cell anchor='west' fill="both"> - <BeanCheckBox id='canGenerate'/> + <BeanCheckBox id='canGenerate' beanScope="model"/> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIModel.java ===================================== @@ -24,6 +24,9 @@ package fr.ird.observe.client.ui.content.data.ll.observation; import fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUIModel; import fr.ird.observe.dto.data.ll.observation.SetLonglineObsDetailCompositionDto; +import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.bean.definition.JavaBeanDefinition; +import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; /** * Created on 12/5/14. @@ -32,7 +35,8 @@ import fr.ird.observe.dto.data.ll.observation.SetLonglineObsDetailCompositionDto * @since 3.8 */ @SuppressWarnings("WeakerAccess") -public class LonglineDetailCompositionObsUIModel extends ContentSimpleUIModel<SetLonglineObsDetailCompositionDto> { +@GenerateJavaBeanDefinition +public class LonglineDetailCompositionObsUIModel extends ContentSimpleUIModel<SetLonglineObsDetailCompositionDto> implements JavaBean { public static final String PROPERTY_CAN_GENERATE = "canGenerate"; @@ -130,4 +134,15 @@ public class LonglineDetailCompositionObsUIModel extends ContentSimpleUIModel<Se firePropertyChange(PROPERTY_GENERATE_TAB_VALID, null, generateTabValid); } + /** + * Lazy helper class that manages all java bean operations. + * + * @see #javaBeanDefinition() + */ + private transient final JavaBeanDefinition javaBeanDefinition = new LonglineDetailCompositionObsUIModelJavaBeanDefinition(); + + @Override + public JavaBeanDefinition javaBeanDefinition() { + return javaBeanDefinition; + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/TdrObsUI.jcss ===================================== @@ -74,6 +74,7 @@ #enableTimestamp { toolTipText:"observe.common.TdrObsDto.enableTimestamp.tip"; + _skipBindingToBean:true; } #timestampPanel { ===================================== services-client/src/test/java/fr/ird/observe/services/client/service/actions/validate/ValidateServiceClientTest.java ===================================== @@ -180,7 +180,7 @@ public class ValidateServiceClientTest extends ServiceClientTestSupport { request.setDataIds(ImmutableSet.of(ObserveFixtures.TRIP_SEINE_ID_1, ObserveFixtures.TRIP_SEINE_ID_2)); SeineBycatchObservedSystemConfig seineBycatchObservedSystemConfig = new SeineBycatchObservedSystemConfig(); ArrayListMultimap<String, String> data = ArrayListMultimap.create(); - data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", " fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); + data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", "fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); seineBycatchObservedSystemConfig.setData(data); request.setSeineBycatchObservedSystemConfig(seineBycatchObservedSystemConfig); @@ -210,7 +210,7 @@ public class ValidateServiceClientTest extends ServiceClientTestSupport { SeineBycatchObservedSystemConfig seineBycatchObservedSystemConfig = new SeineBycatchObservedSystemConfig(); ArrayListMultimap<String, String> data = ArrayListMultimap.create(); - data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", " fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); + data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", "fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); seineBycatchObservedSystemConfig.setData(data); request.setSeineBycatchObservedSystemConfig(seineBycatchObservedSystemConfig); ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java ===================================== @@ -96,7 +96,7 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport { request.setValidationContext(ValidationContext.UPDATE_VALIDATION_CONTEXT); SeineBycatchObservedSystemConfig seineBycatchObservedSystemConfig = new SeineBycatchObservedSystemConfig(); ArrayListMultimap<String, String> data = ArrayListMultimap.create(); - data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", " fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); + data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", "fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); seineBycatchObservedSystemConfig.setData(data); request.setSeineBycatchObservedSystemConfig(seineBycatchObservedSystemConfig); request.setScopes(ImmutableSet.copyOf(NuitonValidatorScope.values())); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9316f9c66fb1e500d2778117769… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9316f9c66fb1e500d2778117769… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Débarquements ne fonctionnent pas - Closes #1286
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 555130ca by tchemit at 2019-05-21T11:12:14Z Débarquements ne fonctionnent pas - Closes #1286 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jcss Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jcss ===================================== @@ -36,6 +36,10 @@ /* CARACTERISTICS TAB ********************************************************* */ /* ***************************************************************************** */ +#dataSourceEditor { + property:dataSource; +} + /* ***************************************************************************** */ /* LANDING PART TAB *********************************************************** */ /* ***************************************************************************** */ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/555130caf86531f1506789aaf9c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/555130caf86531f1506789aaf9c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 8 commits: Impossible de remplir le champ espèces - Closes #1273
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d1f46eec by tchemit at 2019-05-21T10:35:09Z Impossible de remplir le champ espèces - Closes #1273 - - - - - 8f4cb91c by tchemit at 2019-05-21T10:35:12Z Incohérence date de début date de fin - Closes #1276 - - - - - 1b404166 by tchemit at 2019-05-21T10:35:12Z update pom - - - - - 947f5102 by tchemit at 2019-05-21T10:35:12Z Editeurs d'url non actifs - Closes #1275 - - - - - 14009845 by tchemit at 2019-05-21T10:35:12Z update templates - - - - - b31008c7 by tchemit at 2019-05-21T10:35:12Z Impossible d'éditer nouveau DCP - Closes #1279 - - - - - f6dc60ee by tchemit at 2019-05-21T10:58:58Z Pas d'accès à l'activité de fin de veille - Closes #1281 - - - - - 6a931a52 by tchemit at 2019-05-21T10:58:59Z Ajout d'un test pour mieux comprendre le pb - Erreur création activité - See #1283 - - - - - 24 changed files: - .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md - .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/CloseOpenDataFromListUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/OpenOpenDataFromListUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CreateOpenDataUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleDataUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/OpenOpenDataUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveFloatingObjectSeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/Common.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java - client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java - dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - pom.xml Changes: ===================================== .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md ===================================== @@ -9,6 +9,6 @@ ``` /label ~"Anomalie" -/label ~"Contrat SFA-2017" -/milestone %"Contrat SFA-2017" +/label ~"IRD-2018-01-V8" +/milestone %"8.0-beta-1" /assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md ===================================== @@ -1,5 +1,5 @@ /label ~"Evolution" -/label ~"Contrat SFA-2017" +/label ~"IRD-2018-01-V8" /milestone %"Contrat SFA-2017" /assign @tchemit \ No newline at end of file ===================================== client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java ===================================== @@ -129,7 +129,7 @@ public class RouteCloseCallback implements ObserveEditNodeCloseCallback { // on selection l'activity de fin de veille et on y reste // donc on ne continue pas la fermeture de la route - throw new CloseEditNodeVetoException("Fermeture abandonnée! TODO Ajouter message plus explicite.", node); + throw new CloseEditNodeVetoException("Fermeture de la route abandonnée (création d'une activité de fin de veille en cours)", node); } } @@ -139,7 +139,7 @@ public class RouteCloseCallback implements ObserveEditNodeCloseCallback { MutableTreeNode routeNode = tree.select(node).orElseThrow(() -> new IllegalStateException("Can't find route node")); - MultipleReferenceContainerNode<ActivitySeineDto, ActivitySeineReference> parentNode = MultipleReferenceContainerNode.upToReferenceContainerNode(ActivitySeineReference.class, routeNode); + MultipleReferenceContainerNode<ActivitySeineDto, ActivitySeineReference> parentNode = MultipleReferenceContainerNode.downToReferenceContainerNode(ActivitySeineReference.class, routeNode); tree.selectSafeNode(parentNode); log.debug("PARENT NODE = " + parentNode); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/CloseOpenDataFromListUIAction.java ===================================== @@ -30,6 +30,8 @@ import fr.ird.observe.client.ui.content.api.ContentUI; import fr.ird.observe.client.ui.content.api.data.list.ContentListUI; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.navigation.model.edit.CloseEditNodeVetoException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import static io.ultreia.java4all.i18n.I18n.n; @@ -41,6 +43,7 @@ import static io.ultreia.java4all.i18n.I18n.n; */ public class CloseOpenDataFromListUIAction extends AbstractContentUIAction { + private static final Logger log = LogManager.getLogger(CloseOpenDataFromListUIAction.class); public static final String ACTION_NAME = CloseOpenDataFromListUIAction.class.getName(); private static final long serialVersionUID = 1L; @@ -61,7 +64,8 @@ public class CloseOpenDataFromListUIAction extends AbstractContentUIAction { CloseOpenDataUIAction.closeData(((ContentListUI) ui).getModel().getEditNode()); afterClose((ContentListUI) ui); } catch (CloseEditNodeVetoException e1) { - UIHelper.handlingError(e1); + log.error("Could not close data from callback", e1); +// UIHelper.handlingError(e1); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/OpenOpenDataFromListUIAction.java ===================================== @@ -28,12 +28,13 @@ import fr.ird.observe.client.ui.actions.content.api.data.open.OpenOpenDataUIActi import fr.ird.observe.client.ui.content.api.ContentUI; import fr.ird.observe.client.ui.content.api.data.list.ContentListUI; import fr.ird.observe.client.ui.tree.navigation.NavigationTree; -import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.navigation.model.edit.CloseEditNodeVetoException; import fr.ird.observe.navigation.model.edit.ObserveEditNode; import fr.ird.observe.navigation.model.select.ObserveSelectNode; import fr.ird.observe.navigation.tree.ReferenceNode; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import static fr.ird.observe.client.ui.content.api.ContentUIHandler.getNavigationTree; import static io.ultreia.java4all.i18n.I18n.n; @@ -47,6 +48,7 @@ import static io.ultreia.java4all.i18n.I18n.n; */ public class OpenOpenDataFromListUIAction extends AbstractContentUIAction { + private static final Logger log = LogManager.getLogger(OpenOpenDataFromListUIAction.class); public static final String ACTION_NAME = OpenOpenDataFromListUIAction.class.getName(); private static final long serialVersionUID = 1L; @@ -74,7 +76,8 @@ public class OpenOpenDataFromListUIAction extends AbstractContentUIAction { OpenOpenDataUIAction.openData(editNode, selectedNode, id); afterOpen(contentListUI, id); } catch (CloseEditNodeVetoException e1) { - UIHelper.handlingError(e1); + log.error("Could not close data from callback", e1); + //UIHelper.handlingError(e1); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java ===================================== @@ -102,7 +102,8 @@ public class CloseOpenDataUIAction extends AbstractContentUIAction { //FIXME See what does it means ? getMainUI().getHandler().updateContentSize(); } catch (CloseEditNodeVetoException e1) { - UIHelper.handlingError(e1); + log.error("Could not close data from callback", e1); +// UIHelper.handlingError(e1); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CreateOpenDataUIAction.java ===================================== @@ -31,6 +31,8 @@ import fr.ird.observe.client.ui.tree.navigation.NavigationTree; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.navigation.model.edit.CloseEditNodeVetoException; import fr.ird.observe.navigation.tree.MultipleReferenceContainerNode; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * Created on 11/11/16. @@ -40,6 +42,7 @@ import fr.ird.observe.navigation.tree.MultipleReferenceContainerNode; */ public class CreateOpenDataUIAction extends AbstractContentUIAction { + private static final Logger log = LogManager.getLogger(CreateOpenDataUIAction.class); public static final String ACTION_NAME = CreateOpenDataUIAction.class.getName(); public CreateOpenDataUIAction(ObserveMainUI mainUI) { @@ -51,7 +54,8 @@ public class CreateOpenDataUIAction extends AbstractContentUIAction { CloseOpenDataUIAction.closeData(model.getEditNode()); tree.addUnsavedNode(parentNode); } catch (CloseEditNodeVetoException e1) { - UIHelper.handlingError(e1); + log.error("Could not close data from callback", e1); + //UIHelper.handlingError(e1); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleDataUIActionSupport.java ===================================== @@ -153,7 +153,8 @@ public abstract class MoveSingleDataUIActionSupport<ChildDto extends IdDto, Chil try { closeNode(editNode); } catch (CloseEditNodeVetoException e) { - UIHelper.handlingError(e); + log.error("Could not close data from callback", e); +// UIHelper.handlingError(e); return; } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/OpenOpenDataUIAction.java ===================================== @@ -36,6 +36,8 @@ import fr.ird.observe.navigation.model.edit.ObserveEditModelManager; import fr.ird.observe.navigation.model.edit.ObserveEditNode; import fr.ird.observe.navigation.model.edit.OpenEditNodeRequest; import fr.ird.observe.navigation.model.select.ObserveSelectNode; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import static fr.ird.observe.client.ui.content.api.ContentUIHandler.getNavigationTree; import static io.ultreia.java4all.i18n.I18n.n; @@ -49,6 +51,7 @@ import static io.ultreia.java4all.i18n.I18n.n; */ public class OpenOpenDataUIAction extends AbstractContentUIAction { + private static final Logger log = LogManager.getLogger(OpenOpenDataUIAction.class); public static final String ACTION_NAME = OpenOpenDataUIAction.class.getName(); private static final long serialVersionUID = 1L; @@ -83,7 +86,8 @@ public class OpenOpenDataUIAction extends AbstractContentUIAction { openData(editNode, selectedNode, id); afterOpen(openUI); } catch (CloseEditNodeVetoException e1) { - UIHelper.handlingError(e1); + log.error("Could not close data from callback", e1); + //UIHelper.handlingError(e1); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveFloatingObjectSeineUIAction.java ===================================== @@ -28,13 +28,19 @@ import fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.actions.content.api.data.edit.SaveEditDataUIActionSupport; import fr.ird.observe.client.ui.content.data.ps.observation.FloatingObjectUI; import fr.ird.observe.client.ui.content.data.ps.observation.FloatingObjectUIModel; +import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectPartDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.navigation.model.edit.ObserveEditNode; +import fr.ird.observe.navigation.tree.MultipleReferenceContainerNode; +import fr.ird.observe.navigation.tree.ReferenceNode; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.jetbrains.annotations.NotNull; + +import java.util.function.Function; /** * Created by tchemit on 28/09/2018. @@ -68,4 +74,8 @@ public class SaveFloatingObjectSeineUIAction extends SaveEditDataUIActionSupport return true; } + @Override + protected @NotNull Function<FloatingObjectReference, ReferenceNode<FloatingObjectDto, FloatingObjectReference>> getNodeFactory(NavigationTreeNodeSupport parent) { + return ((MultipleReferenceContainerNode) parent)::newChildNode; + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/Common.jcss ===================================== @@ -43,4 +43,9 @@ BigTextEditor { BeanCheckBox { i18nProperty:""; horizontalTextPosition:{BeanCheckBox.LEFT}; +} + +#bodyScrollPane { + verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}; + horizontalScrollBarPolicy:{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}; } \ No newline at end of file ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jaxx ===================================== @@ -125,9 +125,7 @@ public void resetEdit() { <JPanel id='contentContainer'> <JXLayer UI='{blockLayerUI}' constraints='BorderLayout.CENTER'> - <JPanel id='body'/> - </JXLayer> <Table id='actions' constraints='BorderLayout.SOUTH'/> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jcss ===================================== @@ -67,3 +67,7 @@ borderPainted:false; } +#bodyScrollPane { + verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}; + horizontalScrollBarPolicy:{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}; +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUI.jaxx ===================================== @@ -68,13 +68,13 @@ public abstract ContentListUIHandler<E, C, R, U> getHandler(); ]]></script> <JPanel id='body'> - <JScrollPane id='listPane' constraints='BorderLayout.CENTER' onFocusGained='list.requestFocus()' columnHeaderView='{listHeader}'> - <JPanel id='listPanel'> + <JPanel id='listPanel' constraints='BorderLayout.CENTER' > <JLabel id="emptyLabel" constraints='"empty"' styleClass="skipI18n"/> - <JList id='list' genericType='R' constraints='"list"' onMouseClicked='getHandler().onDataSelected(event)'/> + <JScrollPane id='listPane' constraints='"list"' onFocusGained='list.requestFocus()' columnHeaderView='{listHeader}'> + <JList id='list' genericType='R' onMouseClicked='getHandler().onDataSelected(event)'/> + <BeanListHeader id='listHeader' genericType='R'/> + </JScrollPane> </JPanel> - <BeanListHeader id='listHeader' genericType='R'/> - </JScrollPane> </JPanel> <Table id="actions" weightx='1' insets='0' fill="both"> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUI.jcss ===================================== @@ -30,6 +30,7 @@ #listPane { minimumSize:{new Dimension(10,150)}; + verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}; } #listPanelLayout { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUIHandler.java ===================================== @@ -125,11 +125,11 @@ public abstract class ContentListUIHandler<D extends IdDto, C extends DataDto, R getUi().getListSelectionModel().clearSelection(); if (!getModel().isEmpty()) { getUi().getListSelectionModel().setSelectionInterval(0, 0); - getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); - } else { - - getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); +// getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); } +// else { +// getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); +// } }); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUI.jcss ===================================== @@ -136,3 +136,4 @@ verticalAlignment:"center"; horizontalAlignment:"center"; } + ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUI.jaxx ===================================== @@ -80,7 +80,8 @@ protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityObsDt  <JPanel id="body" layout='{new BorderLayout()}'> - <JTabbedPane id='mainTabbedPane' constraints='BorderLayout.CENTER'> + <JScrollPane id='bodyScrollPane' constraints='BorderLayout.CENTER'> + <JTabbedPane id='mainTabbedPane'> <tab id='generalTab' i18nProperty=""> <Table fill="both"> @@ -335,6 +336,7 @@ protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityObsDt <TripMapUI id="tripMap"/> </tab> </JTabbedPane> + </JScrollPane> </JPanel>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUI.jaxx ===================================== @@ -87,7 +87,8 @@ protected boolean canEditOcean(java.util.LinkedHashSet<RouteStubDto> routes) {  <JPanel id="body" layout='{new BorderLayout()}'> - <JTabbedPane id='mainTabbedPane' constraints='BorderLayout.CENTER'> + <JScrollPane id='bodyScrollPane' constraints='BorderLayout.CENTER'> + <JTabbedPane id='mainTabbedPane'> <tab id='generalTab' i18nProperty=""> <Table insets="0" fill="both" id="formGeneral"> @@ -234,6 +235,7 @@ protected boolean canEditOcean(java.util.LinkedHashSet<RouteStubDto> routes) { <TripMapUI id="tripMap"/> </tab> </JTabbedPane> + </JScrollPane> </JPanel>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java ===================================== @@ -404,6 +404,9 @@ public class NavigationTree extends JXTree { if (containerNode == null) { return null; } + if (!((NavigationTreeNodeSupport)containerNode).isLoaded()) { + ((NavigationTreeNodeSupport) containerNode).populateChildren(); + } // got to reference return ReferenceNode.downToReferenceNode(referenceType, editNode.getId(), containerNode); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java ===================================== @@ -36,6 +36,7 @@ import javax.swing.JComponent; import javax.swing.JTable; import java.awt.Color; import java.awt.Component; +import java.util.Objects; import static io.ultreia.java4all.i18n.I18n.t; @@ -59,6 +60,7 @@ public class ObserveValidatorMessageTableRenderer extends SwingValidatorMessageT @Override public String getFieldName(JTable table, String value, int row) { + Objects.requireNonNull(value,"Value can not be null!"); SwingValidatorMessageTableModel tableModel = (SwingValidatorMessageTableModel) table.getModel(); SwingValidatorMessage model = tableModel.getRow(row); JComponent editor = model.getEditor(); ===================================== dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java ===================================== @@ -29,19 +29,19 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto { private static final long serialVersionUID = 1L; //FIXME-PROTECTED-ID public boolean isBoolean() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#0".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#0".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isText() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#3".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#3".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isInteger() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#2".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#2".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isFloat() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#1".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#1".equals(objectMaterialType.getId()); } public boolean withValidation() { ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -911,7 +911,7 @@ observe.common.DataDto.captain=Capitaine observe.common.DataDto.dataQuality=Qualité de donnée observe.common.DataDto.departureHarbour=Port de départ observe.common.DataDto.depthRecorder=Enregistreur de profondeur -observe.common.DataDto.endDate=Date de début +observe.common.DataDto.endDate=Date de fin observe.common.DataDto.haulingIdentifier=Virage observe.common.DataDto.hookLost=Hameçon perdu observe.common.DataDto.landingHarbour=Port d'arrivée @@ -921,7 +921,7 @@ observe.common.DataDto.observer=Observateur observe.common.DataDto.program=Programme observe.common.DataDto.settingIdentifier=Filage observe.common.DataDto.speciesFate=Devenir espèce -observe.common.DataDto.startDate=Date de fin +observe.common.DataDto.startDate=Date de début observe.common.DataDto.timer=Horloge observe.common.DataDto.timerTimeOnBoard=Horodatage de montée à bord observe.common.DataDto.traceCutOff=Bas de ligne coupé ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.17</version> + <version>2019.8.18</version> </parent> <groupId>fr.ird.observe</groupId> @@ -163,7 +163,7 @@   - + <lib.version.java4all.jaxx>3.0-alpha-51</lib.version.java4all.jaxx>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cb1af8b52cee94c5368e91ac01… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cb1af8b52cee94c5368e91ac01… You're receiving this email because of your account on gitlab.com.

1 0