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

[Git][ultreiaio/ird-observe][develop-7.x] Libellés manquants sur formulaire édition espèces - Closes #1241
by Tony CHEMIT March 10, 2019

March 10, 2019

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: b57655a1 by tchemit at 2019-03-10T12:54:39Z Libellés manquants sur formulaire édition espèces - Closes #1241 - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ReferenceEntity.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/CountryUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/DataQualityUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/FpaZoneUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearCaracteristicTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/GearCaracteristicUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/OceanUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/OrganismUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/SexUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/SizeMeasureTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesGroupReleaseModeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/VesselTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/VesselUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/WeightMeasureTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/BaitHaulingStatusUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/BaitSettingStatusUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/BaitTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/CatchFateLonglineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/EncounterTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/HealthnessUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/HookPositionUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/HookSizeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/HookTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ItemHorizontalPositionUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/ItemVerticalPositionUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/LightsticksColorUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/LightsticksTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/LineTypeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/MaturityStatusUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/longline/MitigationTypeUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b57655a1873df79787e1d2e7f98… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b57655a1873df79787e1d2e7f98… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update changelog
by Tony CHEMIT March 3, 2019

March 3, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1d0a9453 by tchemit at 2019-03-03T13:01:54Z update changelog - - - - - 5 changed files: - .mvn/gitlab-cache/milestones/674086-issues.json - + .mvn/gitlab-cache/milestones/796341-artifacts.json - + .mvn/gitlab-cache/milestones/796341-issues.json - + .mvn/gitlab-cache/milestones/796341.json - CHANGELOG.md Changes: ===================================== .mvn/gitlab-cache/milestones/674086-issues.json ===================================== @@ -1,12 +1,75 @@ [ { - "id": 17720198, - "iid": 1202, + "id": 18519374, + "iid": 1238, "projectId": 2722779, - "title": "[UI] Listes déroulantes : ergonomie", - "description": "Une amélioration avait a priori été réalisée sur les listes déroulantes avec autocompletion : que lorsque, par autocompletion, une seule entrée correspondante est trouvée, il soit possible de la sélectionner avec un simple TAB.\n\nOr actuellement, à nouveau (?), il faut nécessairement la sélectionner avec flêche basse, après quoi on peut faire TAB :\n\n![image](/uploads/ba40e3bcd81883430999313d7b33d8e2/image.png)\n\nL\u0027IEO tient à ce détail d\u0027ergonomie qui accélère pas mal la saisie.", + "title": "Nouveau logo", + "description": "Mettre à jour le logo de l\u0027application avec :\n\n![logo_obs7_cmyk_vector_sans_texte_300dpi](/uploads/5900a2a96b18c4c7b52c519fdcd297c6/logo_obs7_cmyk_vector_sans_texte_300dpi.png) ou ![logo_obs7_rvb_300dpi_objectif](/uploads/dccceead7600a5f5a67e29dc23d61a5d/logo_obs7_rvb_300dpi_objectif.png)\n\nLe premier est plus détaillé mais rendra peut-être mal avec les petites résolutions des icônes. A tester.", "labels": [ - "Anomalie" + "Bas", + "Evolution", + "À facturer" + ], + "milestone": { + "id": 674086, + "iid": 128, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-5", + "description": "", + "dueDate": "Nov 4, 2018 1:00:00 AM", + "startDate": "Oct 21, 2018 2:00:00 AM", + "state": "active" + }, + "assignees": [ + { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + } + ], + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "userNotesCount": 1, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Feb 25, 2019 2:09:59 PM", + "createdAt": "Feb 22, 2019 4:35:02 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1238" + }, + { + "id": 18519309, + "iid": 1237, + "projectId": 2722779, + "title": "Rafraichissement de la page \u0027A propos\u0027", + "description": "Supprimer les logos d\u0027ObServe et de l\u0027IRD\n\nMettre :\n* Nouveau logo IRD : ![logo-ird-2016](/uploads/f9d9b1214417dc9c6ec941b495e8bedc/logo-ird-2016.png)\n* Logo Ob7 : ![logo_obs7_rvb_300dpi](/uploads/a084234f58b04482878041c358acf18d/logo_obs7_rvb_300dpi.png)\n* Logo FEAMP (financement UE) : ![Logo_l_Europe_s_engage_FEAMP](/uploads/4c462e26a581404d97d0b52fbc125f1f/Logo_l_Europe_s_engage_FEAMP.png)\n* Logo SFA (en attente d\u0027un logo avec transparence) : ![logo_sfa_high_resolution](/uploads/fe872d782e73a3c158f0ed42771df3a3/logo_sfa_high_resolution.jpg)\n* Logo CRO (en attente d\u0027un logo avec transparence) : ![logo_CRO_Couleur_haute_résolution](/uploads/4d30fda473961d4ad022eda7bbea69bc/logo_CRO_Couleur_haute_résolution.jpeg)\n\nNouveau texte :\n\nObServe\n\nSystème informatique de gestion de données d\u0027observations embarquées de pêche à la senne et à la palangre.\n\nCe projet a été initiée par l\u0027IRD en 2009. Les contributeurs financiers sont : \n* Institut de Recherche pour le Développement (IRD)\n* Fond Européen pour les Affaires Maritimes et la Pêche (FEAMP)\n* Seychelles Fishing Authority (SFA)\n* AZTI Tecnalia\n* Orthongel\n\nIl est réalisé par les sociétés Code Lutin et Ultreia.io depuis 2009.\n \nPour plus d\u0027informations, veuillez visiter le site du projet.", + "labels": [ + "Bas", + "Evolution", + "À facturer" ], "milestone": { "id": 674086, @@ -45,19 +108,79 @@ "_external": false, "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, - "userNotesCount": 5, + "userNotesCount": 1, "upVotes": 0, "downVotes": 0, - "confidential": true, - "discussionLocked": true, + "confidential": false, "timeStats": { "timeEstimate": 0, "totalTimeSpent": 0 }, "state": "opened", - "updatedAt": "Feb 20, 2019 1:21:37 PM", - "createdAt": "Jan 28, 2019 11:39:00 AM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1202" + "updatedAt": "Feb 25, 2019 2:10:22 PM", + "createdAt": "Feb 22, 2019 4:32:32 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1237" + }, + { + "id": 18573039, + "iid": 1239, + "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, ===================================== .mvn/gitlab-cache/milestones/796341-artifacts.json ===================================== @@ -0,0 +1,12 @@ +[ + { + "name": "Application", + "filename": "observe-7.0.6-SNAPSHOT.zip", + "url": "https://ultreia.io/release/observe-7.0.6-SNAPSHOT.zip" + }, + { + "name": "Serveur", + "filename": "observe-7.0.6-SNAPSHOT.war", + "url": "https://ultreia.io/release/observe-7.0.6-SNAPSHOT.war" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/796341-issues.json ===================================== @@ -0,0 +1,121 @@ +[ + { + "id": 18644017, + "iid": 1240, + "projectId": 2722779, + "title": "On trip forms we should not be able to display map\u0027s tab in create mode", + "description": "", + "labels": [ + "Anomalie" + ], + "milestone": { + "id": 796341, + "iid": 137, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.6", + "dueDate": "Mar 3, 2019 1:00:00 AM", + "startDate": "Feb 20, 2019 1:00:00 AM", + "state": "closed" + }, + "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": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "closed", + "updatedAt": "Feb 27, 2019 1:48:44 PM", + "createdAt": "Feb 27, 2019 1:23:00 PM", + "closedAt": "Feb 27, 2019 1:48:44 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1240" + }, + { + "id": 17720198, + "iid": 1202, + "projectId": 2722779, + "title": "[UI] Listes déroulantes : ergonomie", + "description": "Une amélioration avait a priori été réalisée sur les listes déroulantes avec autocompletion : que lorsque, par autocompletion, une seule entrée correspondante est trouvée, il soit possible de la sélectionner avec un simple TAB.\n\nOr actuellement, à nouveau (?), il faut nécessairement la sélectionner avec flêche basse, après quoi on peut faire TAB :\n\n![image](/uploads/ba40e3bcd81883430999313d7b33d8e2/image.png)\n\nL\u0027IEO tient à ce détail d\u0027ergonomie qui accélère pas mal la saisie.", + "labels": [ + "Anomalie" + ], + "milestone": { + "id": 796341, + "iid": 137, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.6", + "dueDate": "Mar 3, 2019 1:00:00 AM", + "startDate": "Feb 20, 2019 1:00:00 AM", + "state": "closed" + }, + "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": true, + "discussionLocked": true, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "closed", + "updatedAt": "Mar 3, 2019 1:57:42 PM", + "createdAt": "Jan 28, 2019 11:39:00 AM", + "closedAt": "Mar 3, 2019 1:57:42 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1202" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/796341.json ===================================== @@ -0,0 +1,10 @@ +{ + "id": 796341, + "iid": 137, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.6", + "dueDate": "Mar 3, 2019 1:00:00 AM", + "startDate": "Feb 20, 2019 1:00:00 AM", + "state": "open" +} \ 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-02-20 13:29. + * Last generated at 2019-03-03 14:01. ## Version [8.0-alpha-4](https://gitlab.com/ultreiaio/ird-observe/milestones/115) Seconde partie du troisième lot du contrat IRD-2018-01-V8.
contient fonctionnalités avancées. @@ -113,6 +113,18 @@ Premier lot du contrat IRD-2018-01-V8 * [[Evolution 922]](https://gitlab.com/ultreiaio/ird-observe/issues/922) **Ajoute le référentiel observe_common.DataQuality sur les données existantes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 950]](https://gitlab.com/ultreiaio/ird-observe/issues/950) **Renommage de la classe seine.WeightCategory en seine.WeightCategorySeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) +## Version [7.0.6](https://gitlab.com/ultreiaio/ird-observe/milestones/137) + +**Closed at 2019-03-03.** + +### Download +* [Application (observe-7.0.6-SNAPSHOT.zip)](https://ultreia.io/release/observe-7.0.6-SNAPSHOT.zip) +* [Serveur (observe-7.0.6-SNAPSHOT.war)](https://ultreia.io/release/observe-7.0.6-SNAPSHOT.war) + +### Issues + * [[Anomalie 1202]](https://gitlab.com/ultreiaio/ird-observe/issues/1202) **[UI] Listes déroulantes : ergonomie** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Anomalie 1240]](https://gitlab.com/ultreiaio/ird-observe/issues/1240) **On trip forms we should not be able to display map's tab in create mode** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + ## Version [7.0.5](https://gitlab.com/ultreiaio/ird-observe/milestones/136) **Closed at 2019-02-20.** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1d0a9453acdcf76bd035a1cf354… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1d0a9453acdcf76bd035a1cf354… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [UI] Listes déroulantes : ergonomie - Closes #1202
by Tony CHEMIT March 3, 2019

March 3, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a9281076 by tchemit at 2019-03-03T12:57:35Z [UI] Listes déroulantes : ergonomie - Closes #1202 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss - pom.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss ===================================== @@ -149,7 +149,6 @@ BeanComboBox { BeanFilterableComboBox { showReset:true; - tabToSelect:false; } NormalTextEditor { ===================================== pom.xml ===================================== @@ -163,7 +163,7 @@   -  + <lib.version.java4all.jaxx>3.0-alpha-50</lib.version.java4all.jaxx>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a92810765eb3dc0c385b7b4f249… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a92810765eb3dc0c385b7b4f249… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [UI] Listes déroulantes : ergonomie - Closes #1202
by Tony CHEMIT March 3, 2019

March 3, 2019

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 4f09de16 by tchemit at 2019-03-03T12:55:50Z [UI] Listes déroulantes : ergonomie - Closes #1202 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss - pom.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss ===================================== @@ -81,7 +81,6 @@ BeanComboBox { BeanFilterableComboBox { showReset:true; - tabToSelect:false; } BlockingLayerUI { ===================================== pom.xml ===================================== @@ -164,7 +164,7 @@  <lib.version.h2>1.4.196</lib.version.h2> <lib.version.java4all.eugene>3.0-alpha-26</lib.version.java4all.eugene> -  + <lib.version.java4all.jaxx>3.0-alpha-50</lib.version.java4all.jaxx>  <lib.version.java4all.topia>1.1.12</lib.version.java4all.topia> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4f09de16a4194d61b99c7eb42d8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4f09de16a4194d61b99c7eb42d8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] On trip forms we should not be able to display map's tab in create mode - Closes #1240
by Tony CHEMIT Feb. 27, 2019

Feb. 27, 2019

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 04e31f4a by tchemit at 2019-02-27T12:23:25Z On trip forms we should not be able to display map's tab in create mode - Closes #1240 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss ===================================== @@ -98,6 +98,10 @@ _propertyName: {TripLonglineDto.PROPERTY_END_DATE}; } +#mapTab { + enabled:{!model.isCreatingMode()} +} + #reopen { _toolTipText:{t("observe.common.TripDto.action.reopen.tip")}; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss ===================================== @@ -133,6 +133,10 @@ NumberEditor { _notBlocking:true; } +#mapTab { + enabled:{!model.isCreatingMode()} +} + #reopen { _toolTipText:{t("observe.common.TripDto.action.reopen.tip")}; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/04e31f4a664f64ff3238c9140ac… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/04e31f4a664f64ff3238c9140ac… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve select tree - Closes #1239
by Tony CHEMIT Feb. 25, 2019

Feb. 25, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e708a186 by tchemit at 2019-02-25T13:08:23Z Improve select tree - Closes #1239 - - - - - 15 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeCellRenderer.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ProgramSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferentialSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferentialsSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/RootSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/SelectionTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/TripLonglineSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/TripSeineSelectionTreeNode.java - + client-core/src/main/resources/icons/checkBox.png - + client-core/src/main/resources/icons/checkBoxIndeterminateSelected.png - + client-core/src/main/resources/icons/checkBoxSelected.png - client-core/src/main/resources/observe-ui.properties Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java ===================================== @@ -61,6 +61,7 @@ public abstract class ObserveKeyStrokes { public static final KeyStroke KEY_STROKE_RELOAD_DEFAULT_CONFIGURATION = KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.ALT_MASK | InputEvent.SHIFT_MASK); public static final KeyStroke KEY_STROKE_ESCAPE = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0); public static final KeyStroke KEY_STROKE_ENTER = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0); + public static final KeyStroke KEY_STROKE_SPACE = KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0); public static final KeyStroke KEY_STROKE_NAVIGATION_CONFIGURE = KeyStroke.getKeyStroke("ctrl pressed F1"); public static final KeyStroke KEY_STROKE_SHOW_SEINE = KeyStroke.getKeyStroke("ctrl pressed F2"); public static final KeyStroke KEY_STROKE_SHOW_LONGLINE = KeyStroke.getKeyStroke("ctrl pressed F3"); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java ===================================== @@ -56,9 +56,11 @@ public class SelectionTree extends JXTree { public void installUI() { + getInputMap().put(ObserveKeyStrokes.KEY_STROKE_SPACE,"none"); InputMap inputMap = getInputMap(WHEN_IN_FOCUSED_WINDOW); ActionMap actionMap = getActionMap(); inputMap.put(ObserveKeyStrokes.KEY_STROKE_ENTER, "select/unselect"); + inputMap.put(ObserveKeyStrokes.KEY_STROKE_SPACE, "select/unselect"); actionMap.put("select/unselect", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { @@ -80,8 +82,11 @@ public class SelectionTree extends JXTree { InputMap inputMap = getInputMap(WHEN_IN_FOCUSED_WINDOW); ActionMap actionMap = getActionMap(); + getInputMap().put(ObserveKeyStrokes.KEY_STROKE_SPACE,"none"); + oppositeTree.getInputMap().put(ObserveKeyStrokes.KEY_STROKE_SPACE,"none"); inputMap.put(ObserveKeyStrokes.KEY_STROKE_ENTER, "select/unselect"); + inputMap.put(ObserveKeyStrokes.KEY_STROKE_SPACE, "select/unselect"); actionMap.put("select/unselect", new AbstractAction() { @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeCellRenderer.java ===================================== @@ -31,9 +31,11 @@ import javax.swing.Icon; import javax.swing.JCheckBox; import javax.swing.JPanel; import javax.swing.JTree; +import javax.swing.UIManager; import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; +import java.util.Objects; /** * Created on 14/11/16. @@ -45,6 +47,8 @@ public class SelectionTreeCellRenderer extends DefaultXTreeCellRenderer { private final JPanel panel; private final JCheckBox selected; + private final Icon unselectedIcon; + private Icon partialIcon; protected SelectionTreeCellRenderer() { selected = new JCheckBox(); @@ -52,6 +56,11 @@ public class SelectionTreeCellRenderer extends DefaultXTreeCellRenderer { panel.setOpaque(false); panel.add(selected, BorderLayout.WEST); panel.add(this, BorderLayout.CENTER); + partialIcon = Objects.requireNonNull(UIManager.getIcon("checkbox.partial")); + unselectedIcon = Objects.requireNonNull(UIManager.getIcon("checkbox.empty")); + selected.setIcon(unselectedIcon); + Icon selectedIcon = Objects.requireNonNull(UIManager.getIcon("checkbox.selected")); + selected.setSelectedIcon(selectedIcon); } public Icon getIcon(SelectionTreeNodeSupport node) { @@ -69,7 +78,9 @@ public class SelectionTreeCellRenderer extends DefaultXTreeCellRenderer { } else if (node instanceof TripLonglineSelectionTreeNode) { setToolTipText(((TripLonglineSelectionTreeNode) node).getToolTipText()); } - selected.setSelected(node.isSelected()); + boolean selected = node.isSelected(); + this.selected.setSelected(selected); + this.selected.setIcon(selected || !node.isPartialSelected() ? unselectedIcon : partialIcon); panel.setPreferredSize(new Dimension(getPreferredSize().width + 20, getPreferredSize().height + 2)); return panel; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ProgramSelectionTreeNode.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.dto.data.ps.common.TripSeineReference; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.referential.common.ProgramDto; import fr.ird.observe.dto.referential.common.ProgramReference; +import fr.ird.observe.navigation.model.edit.ObserveEditModel; import org.apache.commons.collections4.EnumerationUtils; import java.util.Collection; @@ -65,10 +66,12 @@ public class ProgramSelectionTreeNode extends ReferenceSelectionTreeNodeSupport< @Override public boolean isOpen() { - return Objects.equals(ObserveSwingApplicationContext.get().getNavigationEdit().getLongline().getProgram().getId(),toString()) - || Objects.equals(ObserveSwingApplicationContext.get().getNavigationEdit().getSeine().getProgram().getId(),toString()); + ObserveEditModel navigationEdit = getNavigationEditModel(); + return Objects.equals(navigationEdit.getLongline().getProgram().getId(), toString()) + || Objects.equals(navigationEdit.getSeine().getProgram().getId(), toString()); } + @Override public Iterator<TripSelectionTreeNodeSupport<?, ?>> iterator() { return (Iterator) EnumerationUtils.toList(super.children()).iterator(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java ===================================== @@ -26,8 +26,11 @@ import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.IdHelper; import fr.ird.observe.dto.reference.DtoReference; +import fr.ird.observe.navigation.model.edit.ObserveEditModel; import org.nuiton.decorator.Decorator; +import java.util.Enumeration; + /** * Created on 18/11/16. * @@ -69,4 +72,26 @@ public abstract class ReferenceSelectionTreeNodeSupport<D extends IdDto, R exten public void setSelected(boolean selected) { this.selected = selected; } + + @Override + public boolean isPartialSelected() { + if (isSelected()) { + return false; + } + if (isLeaf()) { + return false; + } + Enumeration<SelectionTreeNodeSupport> children = children(); + while (children.hasMoreElements()) { + SelectionTreeNodeSupport nodeSupport = children.nextElement(); + if (nodeSupport.isSelected()) { + return true; + } + } + return false; + } + + ObserveEditModel getNavigationEditModel() { + return ObserveSwingApplicationContext.get().getNavigationEdit(); + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferentialSelectionTreeNode.java ===================================== @@ -66,6 +66,11 @@ public class ReferentialSelectionTreeNode<D extends ReferentialDto> extends Sele return selected; } + @Override + public boolean isPartialSelected() { + return false; + } + @Override public void setSelected(boolean selected) { this.selected = selected; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferentialsSelectionTreeNode.java ===================================== @@ -100,6 +100,19 @@ public class ReferentialsSelectionTreeNode extends SelectionTreeNodeSupport<Stri return true; } + @Override + public boolean isPartialSelected() { + if (isSelected()) { + return false; + } + for (ReferentialSelectionTreeNode<?> nodeSupport : this) { + if (nodeSupport.isSelected()) { + return true; + } + } + return false; + } + public ImmutableList<Class<? extends ReferentialDto>> getSelected() { ImmutableList.Builder<Class<? extends ReferentialDto>> builder = ImmutableList.builder(); for (ReferentialSelectionTreeNode<?> nodeSupport : this) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/RootSelectionTreeNode.java ===================================== @@ -74,6 +74,11 @@ public class RootSelectionTreeNode extends SelectionTreeNodeSupport<Void> implem // rien a faire } + @Override + public boolean isPartialSelected() { + return false; + } + public ReferentialsSelectionTreeNode[] getReferentialsNodes() { ReferentialsSelectionTreeNode[] result = new ReferentialsSelectionTreeNode[3]; result[0] = (ReferentialsSelectionTreeNode) getChildAt(getChildCount() - 3); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/SelectionTreeNodeSupport.java ===================================== @@ -42,6 +42,8 @@ public abstract class SelectionTreeNodeSupport<O> extends DefaultMutableTreeNode public abstract boolean isOpen(); + public abstract boolean isPartialSelected(); + public abstract String getId(); public abstract String getText(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/TripLonglineSelectionTreeNode.java ===================================== @@ -44,7 +44,7 @@ public class TripLonglineSelectionTreeNode extends TripSelectionTreeNodeSupport< @Override public boolean isOpen() { - return Objects.equals(ObserveSwingApplicationContext.get().getNavigationEdit().getLongline().getTrip().getId(), getId()); + return Objects.equals(getNavigationEditModel().getLongline().getTrip().getId(), getId()); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/TripSeineSelectionTreeNode.java ===================================== @@ -44,7 +44,7 @@ public class TripSeineSelectionTreeNode extends TripSelectionTreeNodeSupport<Tri @Override public boolean isOpen() { - return Objects.equals(ObserveSwingApplicationContext.get().getNavigationEdit().getSeine().getTrip().getId(), getId()); + return Objects.equals(getNavigationEditModel().getSeine().getTrip().getId(), getId()); } @Override ===================================== client-core/src/main/resources/icons/checkBox.png ===================================== Binary files /dev/null and b/client-core/src/main/resources/icons/checkBox.png differ ===================================== client-core/src/main/resources/icons/checkBoxIndeterminateSelected.png ===================================== Binary files /dev/null and b/client-core/src/main/resources/icons/checkBoxIndeterminateSelected.png differ ===================================== client-core/src/main/resources/icons/checkBoxSelected.png ===================================== Binary files /dev/null and b/client-core/src/main/resources/icons/checkBoxSelected.png differ ===================================== client-core/src/main/resources/observe-ui.properties ===================================== @@ -65,6 +65,11 @@ icon.navigation.data.ll.observation.ActivityLonglineObs-16=navigation/ird/route1 icon.navigation.data.ll.observation.SetLonglineObs-16=navigation/ird/set16.png icon.navigation.data.ll.observation.CatchLonglineObs-16=navigation/ird/floatingObject16.png icon.navigation.data.ll.observation.TdrObs-16=navigation/ird/floatingObject16.png + +icon.checkbox.empty=checkBox.png +icon.checkbox.partial=checkBoxIndeterminateSelected.png +icon.checkbox.selected=checkBoxSelected.png + # icones d'action sur les editeurs numeriques #icon.action.numbereditor-showpopup=action-numbereditor-showpopup.png #icon.action.numbereditor-reset=action-numbereditor-reset.png View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e708a186b02f699d0bc607297a8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e708a186b02f699d0bc607297a8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve select tree - C:oses #1239
by Tony CHEMIT Feb. 25, 2019

Feb. 25, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 718bcc1c by tchemit at 2019-02-25T13:01:36Z Improve select tree - C:oses #1239 - - - - - 15 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeCellRenderer.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ProgramSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferentialSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferentialsSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/RootSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/SelectionTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/TripLonglineSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/TripSeineSelectionTreeNode.java - + client-core/src/main/resources/icons/checkBox.png - + client-core/src/main/resources/icons/checkBoxIndeterminateSelected.png - + client-core/src/main/resources/icons/checkBoxSelected.png - client-core/src/main/resources/observe-ui.properties Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java ===================================== @@ -61,6 +61,7 @@ public abstract class ObserveKeyStrokes { public static final KeyStroke KEY_STROKE_RELOAD_DEFAULT_CONFIGURATION = KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.ALT_MASK | InputEvent.SHIFT_MASK); public static final KeyStroke KEY_STROKE_ESCAPE = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0); public static final KeyStroke KEY_STROKE_ENTER = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0); + public static final KeyStroke KEY_STROKE_SPACE = KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0); public static final KeyStroke KEY_STROKE_NAVIGATION_CONFIGURE = KeyStroke.getKeyStroke("ctrl pressed F1"); public static final KeyStroke KEY_STROKE_SHOW_SEINE = KeyStroke.getKeyStroke("ctrl pressed F2"); public static final KeyStroke KEY_STROKE_SHOW_LONGLINE = KeyStroke.getKeyStroke("ctrl pressed F3"); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java ===================================== @@ -56,9 +56,11 @@ public class SelectionTree extends JXTree { public void installUI() { + getInputMap().put(ObserveKeyStrokes.KEY_STROKE_SPACE,"none"); InputMap inputMap = getInputMap(WHEN_IN_FOCUSED_WINDOW); ActionMap actionMap = getActionMap(); inputMap.put(ObserveKeyStrokes.KEY_STROKE_ENTER, "select/unselect"); + inputMap.put(ObserveKeyStrokes.KEY_STROKE_SPACE, "select/unselect"); actionMap.put("select/unselect", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { @@ -80,8 +82,11 @@ public class SelectionTree extends JXTree { InputMap inputMap = getInputMap(WHEN_IN_FOCUSED_WINDOW); ActionMap actionMap = getActionMap(); + getInputMap().put(ObserveKeyStrokes.KEY_STROKE_SPACE,"none"); + oppositeTree.getInputMap().put(ObserveKeyStrokes.KEY_STROKE_SPACE,"none"); inputMap.put(ObserveKeyStrokes.KEY_STROKE_ENTER, "select/unselect"); + inputMap.put(ObserveKeyStrokes.KEY_STROKE_SPACE, "select/unselect"); actionMap.put("select/unselect", new AbstractAction() { @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeCellRenderer.java ===================================== @@ -31,9 +31,11 @@ import javax.swing.Icon; import javax.swing.JCheckBox; import javax.swing.JPanel; import javax.swing.JTree; +import javax.swing.UIManager; import java.awt.BorderLayout; import java.awt.Component; import java.awt.Dimension; +import java.util.Objects; /** * Created on 14/11/16. @@ -45,6 +47,8 @@ public class SelectionTreeCellRenderer extends DefaultXTreeCellRenderer { private final JPanel panel; private final JCheckBox selected; + private final Icon unselectedIcon; + private Icon partialIcon; protected SelectionTreeCellRenderer() { selected = new JCheckBox(); @@ -52,6 +56,11 @@ public class SelectionTreeCellRenderer extends DefaultXTreeCellRenderer { panel.setOpaque(false); panel.add(selected, BorderLayout.WEST); panel.add(this, BorderLayout.CENTER); + partialIcon = Objects.requireNonNull(UIManager.getIcon("checkbox.partial")); + unselectedIcon = Objects.requireNonNull(UIManager.getIcon("checkbox.empty")); + selected.setIcon(unselectedIcon); + Icon selectedIcon = Objects.requireNonNull(UIManager.getIcon("checkbox.selected")); + selected.setSelectedIcon(selectedIcon); } public Icon getIcon(SelectionTreeNodeSupport node) { @@ -69,7 +78,9 @@ public class SelectionTreeCellRenderer extends DefaultXTreeCellRenderer { } else if (node instanceof TripLonglineSelectionTreeNode) { setToolTipText(((TripLonglineSelectionTreeNode) node).getToolTipText()); } - selected.setSelected(node.isSelected()); + boolean selected = node.isSelected(); + this.selected.setSelected(selected); + this.selected.setIcon(selected || !node.isPartialSelected() ? unselectedIcon : partialIcon); panel.setPreferredSize(new Dimension(getPreferredSize().width + 20, getPreferredSize().height + 2)); return panel; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ProgramSelectionTreeNode.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.dto.data.ps.common.TripSeineReference; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.referential.common.ProgramDto; import fr.ird.observe.dto.referential.common.ProgramReference; +import fr.ird.observe.navigation.model.edit.ObserveEditModel; import org.apache.commons.collections4.EnumerationUtils; import java.util.Collection; @@ -65,10 +66,12 @@ public class ProgramSelectionTreeNode extends ReferenceSelectionTreeNodeSupport< @Override public boolean isOpen() { - return Objects.equals(ObserveSwingApplicationContext.get().getNavigationEdit().getLongline().getProgram().getId(),toString()) - || Objects.equals(ObserveSwingApplicationContext.get().getNavigationEdit().getSeine().getProgram().getId(),toString()); + ObserveEditModel navigationEdit = getNavigationEditModel(); + return Objects.equals(navigationEdit.getLongline().getProgram().getId(), toString()) + || Objects.equals(navigationEdit.getSeine().getProgram().getId(), toString()); } + @Override public Iterator<TripSelectionTreeNodeSupport<?, ?>> iterator() { return (Iterator) EnumerationUtils.toList(super.children()).iterator(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java ===================================== @@ -26,8 +26,11 @@ import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.IdHelper; import fr.ird.observe.dto.reference.DtoReference; +import fr.ird.observe.navigation.model.edit.ObserveEditModel; import org.nuiton.decorator.Decorator; +import java.util.Enumeration; + /** * Created on 18/11/16. * @@ -69,4 +72,26 @@ public abstract class ReferenceSelectionTreeNodeSupport<D extends IdDto, R exten public void setSelected(boolean selected) { this.selected = selected; } + + @Override + public boolean isPartialSelected() { + if (isSelected()) { + return false; + } + if (isLeaf()) { + return false; + } + Enumeration<SelectionTreeNodeSupport> children = children(); + while (children.hasMoreElements()) { + SelectionTreeNodeSupport nodeSupport = children.nextElement(); + if (nodeSupport.isSelected()) { + return true; + } + } + return false; + } + + ObserveEditModel getNavigationEditModel() { + return ObserveSwingApplicationContext.get().getNavigationEdit(); + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferentialSelectionTreeNode.java ===================================== @@ -66,6 +66,11 @@ public class ReferentialSelectionTreeNode<D extends ReferentialDto> extends Sele return selected; } + @Override + public boolean isPartialSelected() { + return false; + } + @Override public void setSelected(boolean selected) { this.selected = selected; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferentialsSelectionTreeNode.java ===================================== @@ -100,6 +100,19 @@ public class ReferentialsSelectionTreeNode extends SelectionTreeNodeSupport<Stri return true; } + @Override + public boolean isPartialSelected() { + if (isSelected()) { + return false; + } + for (ReferentialSelectionTreeNode<?> nodeSupport : this) { + if (nodeSupport.isSelected()) { + return true; + } + } + return false; + } + public ImmutableList<Class<? extends ReferentialDto>> getSelected() { ImmutableList.Builder<Class<? extends ReferentialDto>> builder = ImmutableList.builder(); for (ReferentialSelectionTreeNode<?> nodeSupport : this) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/RootSelectionTreeNode.java ===================================== @@ -74,6 +74,11 @@ public class RootSelectionTreeNode extends SelectionTreeNodeSupport<Void> implem // rien a faire } + @Override + public boolean isPartialSelected() { + return false; + } + public ReferentialsSelectionTreeNode[] getReferentialsNodes() { ReferentialsSelectionTreeNode[] result = new ReferentialsSelectionTreeNode[3]; result[0] = (ReferentialsSelectionTreeNode) getChildAt(getChildCount() - 3); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/SelectionTreeNodeSupport.java ===================================== @@ -42,6 +42,8 @@ public abstract class SelectionTreeNodeSupport<O> extends DefaultMutableTreeNode public abstract boolean isOpen(); + public abstract boolean isPartialSelected(); + public abstract String getId(); public abstract String getText(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/TripLonglineSelectionTreeNode.java ===================================== @@ -44,7 +44,7 @@ public class TripLonglineSelectionTreeNode extends TripSelectionTreeNodeSupport< @Override public boolean isOpen() { - return Objects.equals(ObserveSwingApplicationContext.get().getNavigationEdit().getLongline().getTrip().getId(), getId()); + return Objects.equals(getNavigationEditModel().getLongline().getTrip().getId(), getId()); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/TripSeineSelectionTreeNode.java ===================================== @@ -44,7 +44,7 @@ public class TripSeineSelectionTreeNode extends TripSelectionTreeNodeSupport<Tri @Override public boolean isOpen() { - return Objects.equals(ObserveSwingApplicationContext.get().getNavigationEdit().getSeine().getTrip().getId(), getId()); + return Objects.equals(getNavigationEditModel().getSeine().getTrip().getId(), getId()); } @Override ===================================== client-core/src/main/resources/icons/checkBox.png ===================================== Binary files /dev/null and b/client-core/src/main/resources/icons/checkBox.png differ ===================================== client-core/src/main/resources/icons/checkBoxIndeterminateSelected.png ===================================== Binary files /dev/null and b/client-core/src/main/resources/icons/checkBoxIndeterminateSelected.png differ ===================================== client-core/src/main/resources/icons/checkBoxSelected.png ===================================== Binary files /dev/null and b/client-core/src/main/resources/icons/checkBoxSelected.png differ ===================================== client-core/src/main/resources/observe-ui.properties ===================================== @@ -65,6 +65,11 @@ icon.navigation.data.ll.observation.ActivityLonglineObs-16=navigation/ird/route1 icon.navigation.data.ll.observation.SetLonglineObs-16=navigation/ird/set16.png icon.navigation.data.ll.observation.CatchLonglineObs-16=navigation/ird/floatingObject16.png icon.navigation.data.ll.observation.TdrObs-16=navigation/ird/floatingObject16.png + +icon.checkbox.empty=checkBox.png +icon.checkbox.partial=checkBoxIndeterminateSelected.png +icon.checkbox.selected=checkBoxSelected.png + # icones d'action sur les editeurs numeriques #icon.action.numbereditor-showpopup=action-numbereditor-showpopup.png #icon.action.numbereditor-reset=action-numbereditor-reset.png View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/718bcc1c7009f075bb40f32dd60… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/718bcc1c7009f075bb40f32dd60… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT Feb. 20, 2019

Feb. 20, 2019

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 7cb1289f by 166231 at 2019-02-20T13:11:30Z Site checkin for project ObServe :: Pom - - - - - 5 changed files: - administration-web.html - architecture-logicielle.html - index.html - install-serverPG.html - install.html Changes: ===================================== administration-web.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190218" /> + <meta name="Date-Revision-yyyymmdd" content="20190220" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation de lapplication web</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Installation de lapplication web</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-18</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.4</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-20</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.5</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -101,7 +101,7 @@ <pre class="source"> /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-7.0.4.log # logs de l'application + | `-- observeweb-7.0.5.log # logs de l'application |-- observeweb-log4j2.xml # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs ===================================== architecture-logicielle.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190218" /> + <meta name="Date-Revision-yyyymmdd" content="20190220" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Architecture logicielle dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Architecture logicielle dObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-18</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.4</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-20</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.5</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== index.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190218" /> + <meta name="Date-Revision-yyyymmdd" content="20190220" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – ObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">ObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-18</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.4</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-20</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.5</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install-serverPG.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190218" /> + <meta name="Date-Revision-yyyymmdd" content="20190220" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation du serveur Obstuna</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Installation du serveur Obstuna</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-18</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.4</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-20</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.5</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190218" /> + <meta name="Date-Revision-yyyymmdd" content="20190220" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Installation dObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-18</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.4</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-20</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.5</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7cb1289fbf7f0a258b8954a41f9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7cb1289fbf7f0a258b8954a41f9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Revert "[LL] Composition globale : non contrôle de la somme des proportions - Closes #1236"
by Tony CHEMIT Feb. 20, 2019

Feb. 20, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 100ff1ea by tchemit at 2019-02-20T12:51:06Z Revert "[LL] Composition globale : non contrôle de la somme des proportions - Closes #1236" This reverts commit 4002d967 - - - - - 8 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/BaitsCompositionLogbookUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/BranchlinesCompositionLogbookUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/FloatlinesCompositionLogbookUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/HooksCompositionLogbookUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BaitsCompositionObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlinesCompositionObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/FloatlinesCompositionObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/HooksCompositionObsUI.jaxx Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/BaitsCompositionLogbookUI.jaxx ===================================== @@ -58,7 +58,6 @@ beanClass='fr.ird.observe.dto.data.ll.logbook.SetLonglineLogbookGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> <field name="baitsComposition" component="editorPanel"/> - <field name="baitsCompositionProportionSum" component="proportionSum"/> </BeanValidator>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/BranchlinesCompositionLogbookUI.jaxx ===================================== @@ -57,7 +57,6 @@ beanClass='fr.ird.observe.dto.data.ll.logbook.SetLonglineLogbookGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> <field name="branchlinesComposition" component="editorPanel"/> - <field name="branchlinesCompositionProportionSum" component="proportionSum"/> </BeanValidator>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/FloatlinesCompositionLogbookUI.jaxx ===================================== @@ -57,7 +57,6 @@ beanClass='fr.ird.observe.dto.data.ll.logbook.SetLonglineLogbookGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> <field name="floatlinesComposition" component="editorPanel"/> - <field name="floatlinesCompositionProportionSum" component="proportionSum"/> </BeanValidator>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/HooksCompositionLogbookUI.jaxx ===================================== @@ -58,7 +58,6 @@ beanClass='fr.ird.observe.dto.data.ll.logbook.SetLonglineLogbookGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> <field name="hooksComposition" component="editorPanel"/> - <field name="hooksCompositionProportionSum" component="proportionSum"/> </BeanValidator>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BaitsCompositionObsUI.jaxx ===================================== @@ -58,7 +58,6 @@ beanClass='fr.ird.observe.dto.data.ll.observation.SetLonglineObsGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> <field name="baitsComposition" component="editorPanel"/> - <field name="baitsCompositionProportionSum" component="proportionSum"/> </BeanValidator>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlinesCompositionObsUI.jaxx ===================================== @@ -57,7 +57,6 @@ beanClass='fr.ird.observe.dto.data.ll.observation.SetLonglineObsGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> <field name="branchlinesComposition" component="editorPanel"/> - <field name="branchlinesCompositionProportionSum" component="proportionSum"/> </BeanValidator>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/FloatlinesCompositionObsUI.jaxx ===================================== @@ -57,7 +57,6 @@ beanClass='fr.ird.observe.dto.data.ll.observation.SetLonglineObsGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> <field name="floatlinesComposition" component="editorPanel"/> - <field name="floatlinesCompositionProportionSum" component="proportionSum"/> </BeanValidator>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/HooksCompositionObsUI.jaxx ===================================== @@ -58,7 +58,6 @@ beanClass='fr.ird.observe.dto.data.ll.observation.SetLonglineObsGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> <field name="hooksComposition" component="editorPanel"/> - <field name="hooksCompositionProportionSum" component="proportionSum"/> </BeanValidator>  View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/100ff1ea016f5414e7005ac2f80… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/100ff1ea016f5414e7005ac2f80… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.0.5
by Tony CHEMIT Feb. 20, 2019

Feb. 20, 2019

Tony CHEMIT deleted branch release/7.0.5 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0