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

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.0.6-SNAPSHOT development[skip ci]
by Tony CHEMIT Feb. 20, 2019

Feb. 20, 2019

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 8c069d7d by tchemit at 2019-02-20T12:31:29Z [jgitflow-maven-plugin]updating poms for 7.0.6-SNAPSHOT development[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.6-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.6-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.6-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.6-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.6-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.6-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.6-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.6-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.6-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.6-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.6-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.6-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.6-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.6-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.6-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.5-SNAPSHOT</version> + <version>7.0.6-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8c069d7dbe4c9288b6ea22f5d7e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8c069d7dbe4c9288b6ea22f5d7e… You're receiving this email because of your account on gitlab.com.

1 0

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

Feb. 20, 2019

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

1 0

[Git][ultreiaio/ird-observe][develop] update changelog
by Tony CHEMIT Feb. 20, 2019

Feb. 20, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dd2d16a2 by tchemit at 2019-02-20T12:30:08Z update changelog - - - - - 5 changed files: - .mvn/gitlab-cache/milestones/674086-issues.json - + .mvn/gitlab-cache/milestones/793328-artifacts.json - .mvn/gitlab-cache/milestones/793328-issues.json - .mvn/gitlab-cache/milestones/793328.json - CHANGELOG.md Changes: ===================================== .mvn/gitlab-cache/milestones/674086-issues.json ===================================== @@ -1,4 +1,64 @@ [ + { + "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": 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": 5, + "upVotes": 0, + "downVotes": 0, + "confidential": true, + "discussionLocked": true, + "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" + }, { "id": 17565900, "iid": 1200, ===================================== .mvn/gitlab-cache/milestones/793328-artifacts.json ===================================== @@ -0,0 +1,12 @@ +[ + { + "name": "Application", + "filename": "observe-7.0.5.zip", + "url": "http://repo1.maven.org/maven2/fr/ird/observe/observe/7.0.5/observe-7.0.5.zip" + }, + { + "name": "Serveur", + "filename": "observe-7.0.5.war", + "url": "http://repo1.maven.org/maven2/fr/ird/observe/observe/7.0.5/observe-7.0.5.war" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/793328-issues.json ===================================== @@ -1 +1,188 @@ -[] \ No newline at end of file +[ + { + "id": 18327153, + "iid": 1234, + "projectId": 2722779, + "title": "[PS] Formulaire FOB : les contrôles de saisie ne sont pas appliqués", + "description": "Formulaire FOB : les contrôles de saisie sur les champs autres que booléens ne fonctionnent pas :\n\n![image](/uploads/966ad2e05681e688a8c7d3b2b1b7dfbe/image.png)\n\nIci on a pu saisir des valeurs supérieures au contrôle attendu.", + "labels": [ + "Anomalie", + "Haut", + "Résolu" + ], + "milestone": { + "id": 793328, + "iid": 136, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.5", + "dueDate": "Feb 20, 2019 1:00:00 AM", + "startDate": "Feb 18, 2019 1:00:00 AM", + "state": "closed" + }, + "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": 4, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "closed", + "updatedAt": "Feb 20, 2019 1:21:06 PM", + "createdAt": "Feb 18, 2019 3:55:44 PM", + "closedAt": "Feb 19, 2019 12:44:25 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1234" + }, + { + "id": 18250570, + "iid": 1232, + "projectId": 2722779, + "title": "Equipement bateau, bug sur suppression de caractéristique", + "description": "Dans une marée comme celle-ci : [OI_20181020-20181113_SINON_SAP_BELLEISLE_Base.sql.gz](/uploads/9384450fe3a069778f904032a207bc5e/OI_20181020-20181113_SINON_SAP_BELLEISLE_Base.sql.gz)\n\nOn souhaite supprimer les caractéristiques dont la valeur est \u00270\u0027 : \n\n![image](/uploads/313f8b2bfc9fd2b38466092e197af4c7/image.png)\n\nEn supprimant dans l\u0027ordre les propriétés 2, 7, puis 19 (mais est-ce important ?), on voit passer dans le terminal l\u0027erreur suivante (et pas dans le log) :\n\n```\nINFO 2019-02-15T02:44:40,753 [AWT-EventQueue-0] GearUseFeaturesSeineUIHandler : 225 - Delete: GearUseFeaturesMeasurementSeineDto{id\u003dfr.ird.observe.e\nntities.seine.GearUseFeaturesMeasurementSeine#1542022378848#0.9236800165565513, lastUpdateDate\u003d2018-11-12 11:36:56.764}\nINFO 2019-02-15T02:44:45,475 [AWT-EventQueue-0] GearUseFeaturesSeineUIHandler : 225 - Delete: GearUseFeaturesMeasurementSeineDto{id\u003dfr.ird.observe.e\nntities.seine.GearUseFeaturesMeasurementSeine#1542022378864#0.2962143640677609, lastUpdateDate\u003d2018-11-12 11:36:56.764}\nException in thread \"AWT-EventQueue-0\" java.lang.IndexOutOfBoundsException: Index: 5, Size: 5\n at java.util.ArrayList.rangeCheck(Unknown Source)\n at java.util.ArrayList.get(Unknown Source)\n at fr.ird.observe.client.ui.content.data.seine.GearUseFeaturesMeasurementSeinesTableModel.setValueAt(GearUseFeaturesMeasurementSeinesTableModel.java:100\n)\n at javax.swing.JTable.setValueAt(Unknown Source)\n at javax.swing.JTable.editingStopped(Unknown Source)\n at javax.swing.AbstractCellEditor.fireEditingStopped(Unknown Source)\n at javax.swing.DefaultCellEditor$EditorDelegate.stopCellEditing(Unknown Source)\n at org.jdesktop.swingx.autocomplete.ComboBoxCellEditor$1.stopCellEditing(ComboBoxCellEditor.java:88)\n at javax.swing.DefaultCellEditor.stopCellEditing(Unknown Source)\n at javax.swing.JTable.editCellAt(Unknown Source)\n at javax.swing.JTable.editCellAt(Unknown Source)\n at org.nuiton.jaxx.runtime.swing.JTables.doSelectCell(JTables.java:121)\n at fr.ird.observe.client.ui.content.data.seine.GearUseFeaturesSeineUIHandler.lambda$selectCell$6(GearUseFeaturesSeineUIHandler.java:171)\n at java.awt.event.InvocationEvent.dispatch(Unknown Source)\n at java.awt.EventQueue.dispatchEventImpl(Unknown Source)\n at java.awt.EventQueue.access$500(Unknown Source)\n at java.awt.EventQueue$3.run(Unknown Source)\n at java.awt.EventQueue$3.run(Unknown Source)\n at java.security.AccessController.doPrivileged(Native Method)\n at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source)\n at java.awt.EventQueue.dispatchEvent(Unknown Source)\n at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source)\n at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source)\n at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source)\n at java.awt.EventDispatchThread.pumpEvents(Unknown Source)\n at java.awt.EventDispatchThread.pumpEvents(Unknown Source)\n at java.awt.EventDispatchThread.run(Unknown Source)\nException in thread \"AWT-EventQueue-0\" java.lang.IndexOutOfBoundsException: Index: 5, Size: 5\n at java.util.ArrayList.rangeCheck(Unknown Source)\n at java.util.ArrayList.get(Unknown Source)\n at fr.ird.observe.client.ui.content.data.seine.GearUseFeaturesMeasurementSeinesTableModel.setValueAt(GearUseFeaturesMeasurementSeinesTableModel.java:100\n)\n at javax.swing.JTable.setValueAt(Unknown Source)\n at javax.swing.JTable.editingStopped(Unknown Source)\n at javax.swing.AbstractCellEditor.fireEditingStopped(Unknown Source)\n at javax.swing.DefaultCellEditor$EditorDelegate.stopCellEditing(Unknown Source)\n at org.jdesktop.swingx.autocomplete.ComboBoxCellEditor$1.stopCellEditing(ComboBoxCellEditor.java:88)\n at javax.swing.DefaultCellEditor.stopCellEditing(Unknown Source)\n at javax.swing.JTable.editCellAt(Unknown Source)\n at javax.swing.JTable.editCellAt(Unknown Source)\n at org.nuiton.jaxx.runtime.swing.JTables.doSelectCell(JTables.java:121)\n at fr.ird.observe.client.ui.content.data.seine.GearUseFeaturesSeineUIHandler.lambda$selectCell$6(GearUseFeaturesSeineUIHandler.java:171)\n at java.awt.event.InvocationEvent.dispatch(Unknown Source)\n at java.awt.EventQueue.dispatchEventImpl(Unknown Source)\n at java.awt.EventQueue.access$500(Unknown Source)\n at java.awt.EventQueue$3.run(Unknown Source)\n at java.awt.EventQueue$3.run(Unknown Source)\n at java.security.AccessController.doPrivileged(Native Method)\n at java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source)\n at java.awt.EventQueue.dispatchEvent(Unknown Source)\n at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source)\n at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source)\n at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source)\n at java.awt.EventDispatchThread.pumpEvents(Unknown Source)\n at java.awt.EventDispatchThread.pumpEvents(Unknown Source)\n at java.awt.EventDispatchThread.run(Unknown Source)\n```\n\nLog à partir de 02h49 : [observe-7.0.3-SNAPSHOT.log](/uploads/d0bd193b5b5925a5329d3042a6f258ec/observe-7.0.3-SNAPSHOT.log)\n\nL\u0027application se retrouve gelée, ou fonctionne ensuite de manière erratique.", + "labels": [ + "Anomalie", + "Contrat Code Lutin-2016", + "Haut", + "Résolu" + ], + "milestone": { + "id": 793328, + "iid": 136, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.5", + "dueDate": "Feb 20, 2019 1:00:00 AM", + "startDate": "Feb 18, 2019 1:00:00 AM", + "state": "closed" + }, + "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": 15, + "upVotes": 0, + "downVotes": 0, + "confidential": true, + "discussionLocked": true, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "closed", + "updatedAt": "Feb 20, 2019 1:21:06 PM", + "createdAt": "Feb 14, 2019 11:48:42 PM", + "closedAt": "Feb 16, 2019 1:29:12 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1232" + }, + { + "id": 18331089, + "iid": 1236, + "projectId": 2722779, + "title": "[LL] Composition globale : non contrôle de la somme des proportions", + "description": "Normalement la somme des proportion doit faire 100%, pas plus, pas moins.\n\nSur l\u0027ensemble de ces onglets, ce contrôle semble ne plus opérer.\n\n![image](/uploads/78d44bebbbacac09fd313028a03f71ba/image.png)\n\n![image](/uploads/9a0b6388befaff06c961e82c20fc4c68/image.png)", + "labels": [ + "Anomalie", + "Contrat Code Lutin-2016", + "Normal", + "À facturer" + ], + "milestone": { + "id": 793328, + "iid": 136, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.5", + "dueDate": "Feb 20, 2019 1:00:00 AM", + "startDate": "Feb 18, 2019 1:00:00 AM", + "state": "closed" + }, + "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": 5, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "closed", + "updatedAt": "Feb 20, 2019 12:09:17 PM", + "createdAt": "Feb 18, 2019 5:22:06 PM", + "closedAt": "Feb 20, 2019 12:08:07 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1236" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/793328.json ===================================== @@ -4,6 +4,7 @@ "projectId": 2722779, "groupId": 0, "title": "7.0.5", + "dueDate": "Feb 20, 2019 1:00:00 AM", "startDate": "Feb 18, 2019 1:00:00 AM", - "state": "active" + "state": "closed" } \ No newline at end of file ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2019-02-18 11:16. + * Last generated at 2019-02-20 13:29. ## 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,19 @@ 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.5](https://gitlab.com/ultreiaio/ird-observe/milestones/136) + +**Closed at 2019-02-20.** + +### Download +* [Application (observe-7.0.5.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/7.…) +* [Serveur (observe-7.0.5.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/7.…) + +### Issues + * [[Anomalie 1232]](https://gitlab.com/ultreiaio/ird-observe/issues/1232) **Equipement bateau, bug sur suppression de caractéristique** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1234]](https://gitlab.com/ultreiaio/ird-observe/issues/1234) **[PS] Formulaire FOB : les contrôles de saisie ne sont pas appliqués** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1236]](https://gitlab.com/ultreiaio/ird-observe/issues/1236) **[LL] Composition globale : non contrôle de la somme des proportions** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + ## Version [7.0.4](https://gitlab.com/ultreiaio/ird-observe/milestones/135) **Closed at 2019-02-18.** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dd2d16a2178065d218037d25f48… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dd2d16a2178065d218037d25f48… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [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-7.x at ultreiaio / ird-observe Commits: 803fa23f by tchemit at 2019-02-20T09:57:10Z [LL] Composition globale : non contrôle de la somme des proportions - Closes #1236 - - - - - 6 changed files: - pom.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-baitsComposition-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-branchlinesComposition-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-floatlinesComposition-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-hooksComposition-error-validation.xml - validation/src/main/resources/validators.xml Changes: ===================================== pom.xml ===================================== @@ -155,7 +155,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>3.7.16</observeToolkitVersion> + <observeToolkitVersion>3.7.17</observeToolkitVersion>  <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-baitsComposition-error-validation.xml ===================================== @@ -31,9 +31,7 @@ </field-validator> </field> <field name="baitsCompositionProportionSum"> - <field-validator type="boundNumber" short-circuit="true"> - <param name="min">0.0</param> - <param name="max">100.0</param> + <field-validator type="proportionTotal" short-circuit="true"> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-branchlinesComposition-error-validation.xml ===================================== @@ -31,9 +31,7 @@ </field-validator> </field> <field name="branchlinesCompositionProportionSum"> - <field-validator type="boundNumber" short-circuit="true"> - <param name="min">0.0</param> - <param name="max">100.0</param> + <field-validator type="proportionTotal" short-circuit="true"> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-floatlinesComposition-error-validation.xml ===================================== @@ -31,9 +31,7 @@ </field-validator> </field> <field name="floatlinesCompositionProportionSum"> - <field-validator type="boundNumber" short-circuit="true"> - <param name="min">0.0</param> - <param name="max">100.0</param> + <field-validator type="proportionTotal" short-circuit="true"> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineGlobalCompositionDto-update-hooksComposition-error-validation.xml ===================================== @@ -31,9 +31,7 @@ </field-validator> </field> <field name="hooksCompositionProportionSum"> - <field-validator type="boundNumber" short-circuit="true"> - <param name="min">0.0</param> - <param name="max">100.0</param> + <field-validator type="proportionTotal" short-circuit="true"> <message/> </field-validator> </field> ===================================== validation/src/main/resources/validators.xml ===================================== @@ -60,6 +60,7 @@ <validator name="collectionNotFilled" class="fr.ird.observe.validation.validators.CollectionNotFilledFieldValidator"/> <validator name="positiveNumber" class="fr.ird.observe.validation.validators.PositiveNumberFieldValidator"/> <validator name="boundNumber" class="fr.ird.observe.validation.validators.BoundNumberFieldValidator"/> + <validator name="proportionTotal" class="fr.ird.observe.validation.validators.ProportionTotalFieldValidator"/> <validator name="referentialUniqueCode" class="fr.ird.observe.validation.validators.ReferentialUniqueCodeValidator"/> <validator name="referentialUniqueField" class="fr.ird.observe.validation.validators.ReferentialUniqueFieldValidator"/> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/803fa23f87bc46339372f15a2c5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/803fa23f87bc46339372f15a2c5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Equipement bateau, bug sur suppression de caractéristique - Closes #1232
by Tony CHEMIT Feb. 19, 2019

Feb. 19, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7492392c by tchemit at 2019-02-19T16:33:50Z Equipement bateau, bug sur suppression de caractéristique - Closes #1232 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/GearUseFeaturesLonglineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/GearUseFeaturesSeineUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/GearUseFeaturesLonglineUIHandler.java ===================================== @@ -345,6 +345,8 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip // user cancel return; } + + UIHelper.stopEditing(ui.getMeasurementsTable()); tableModel.removeSelectedRow(); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/GearUseFeaturesSeineUIHandler.java ===================================== @@ -183,6 +183,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei return; } + UIHelper.stopEditing(ui.getMeasurementsTable()); tableModel.removeSelectedRow(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7492392c88bd250ff35bda20425… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7492392c88bd250ff35bda20425… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Equipement bateau, bug sur suppression de caractéristique - Closes #1232
by Tony CHEMIT Feb. 19, 2019

Feb. 19, 2019

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f8d6ef63 by tchemit at 2019-02-19T16:31:43Z Equipement bateau, bug sur suppression de caractéristique - Closes #1232 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java ===================================== @@ -243,6 +243,7 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip return; } + UIHelper.stopEditing(ui.getMeasurementsTable()); tableModel.removeSelectedRow(); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java ===================================== @@ -246,6 +246,7 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei return; } + UIHelper.stopEditing(ui.getMeasurementsTable()); tableModel.removeSelectedRow(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f8d6ef6391e8372b2d5cf79669e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f8d6ef6391e8372b2d5cf79669e… You're receiving this email because of your account on gitlab.com.

1 0

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

Feb. 19, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4002d967 by tchemit at 2019-02-19T15:29:16Z [LL] Composition globale : non contrôle de la somme des proportions - Closes #1236 - - - - - 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,6 +58,7 @@ 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,6 +57,7 @@ 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,6 +57,7 @@ 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,6 +58,7 @@ 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,6 +58,7 @@ 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,6 +57,7 @@ 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,6 +57,7 @@ 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,6 +58,7 @@ 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/4002d967b516933488609f00c3e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4002d967b516933488609f00c3e… You're receiving this email because of your account on gitlab.com.

1 0

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

Feb. 19, 2019

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 46c0980f by tchemit at 2019-02-19T15:25:59Z [LL] Composition globale : non contrôle de la somme des proportions - Closes #1236 - - - - - 5 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/FloatlinesCompositionUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/HooksCompositionUI.jaxx - pom.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionUI.jaxx ===================================== @@ -58,6 +58,7 @@ beanClass='fr.ird.observe.dto.data.longline.SetLonglineGlobalCompositionDto' 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/longline/BranchlinesCompositionUI.jaxx ===================================== @@ -57,6 +57,7 @@ beanClass='fr.ird.observe.dto.data.longline.SetLonglineGlobalCompositionDto' 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/longline/FloatlinesCompositionUI.jaxx ===================================== @@ -57,6 +57,7 @@ beanClass='fr.ird.observe.dto.data.longline.SetLonglineGlobalCompositionDto' 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/longline/HooksCompositionUI.jaxx ===================================== @@ -58,6 +58,7 @@ beanClass='fr.ird.observe.dto.data.longline.SetLonglineGlobalCompositionDto' errorTableModel='{getErrorTableModel()}'> <field name="hooksComposition" component="editorPanel"/> + <field name="hooksCompositionProportionSum" component="proportionSum"/> </BeanValidator>  ===================================== pom.xml ===================================== @@ -155,7 +155,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>3.7.15</observeToolkitVersion> + <observeToolkitVersion>3.7.16</observeToolkitVersion>  <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/46c0980fd9a2e539eaddccc4c8a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/46c0980fd9a2e539eaddccc4c8a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [PS] Formulaire FOB : les contrôles de saisie ne sont pas appliqués - Closes #1234
by Tony CHEMIT Feb. 19, 2019

Feb. 19, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4a398696 by tchemit at 2019-02-19T11:44:14Z [PS] Formulaire FOB : les contrôles de saisie ne sont pas appliqués - Closes #1234 - - - - - 5 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/dcp/FloatingObjectPartsTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/dcp/FloatingObjectPartsTreeTable.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/dcp/FloatingObjectPartsTreeTableModel.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectUIHandler.java ===================================== @@ -209,6 +209,6 @@ public class FloatingObjectUIHandler extends ContentEditUIHandler<FloatingObject getModel().setLeaving(operation.isWhenLeaving()); } FloatingObjectPartsTreeTableModel treeModel = getUi().getTable().getTreeTableModel(); - treeModel.reset(); + treeModel.reset(true); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectUIModel.java ===================================== @@ -159,6 +159,16 @@ public class FloatingObjectUIModel extends ContentEditUIModel<FloatingObjectDto, whenLeaving.put(dto, value); } + public Object getWhenArriving(String id) { + ObjectMaterialDto dto = Objects.requireNonNull(referentialMap.get(id)); + return whenArriving.get(dto); + } + + public Object getWhenLeaving(String id) { + ObjectMaterialDto dto = Objects.requireNonNull(referentialMap.get(id)); + return whenLeaving.get(dto); + } + public Optional<FloatingObjectPreset> getReference() { return Optional.ofNullable(reference); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/dcp/FloatingObjectPartsTreeNode.java ===================================== @@ -73,7 +73,7 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im } boolean isNotValid() { - return !(getUserObject().validWhenArriving && getUserObject().validWhenLeaving); + return !(isValid(1) && isValid(2)); } @Override @@ -153,6 +153,10 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im return getUserObject().dto.isFloat(); } + public boolean withValidation() { + return getUserObject().dto.withValidation(); + } + ObjectMaterialTypeReference getObjectMaterialType() { return getUserObject().dto.getObjectMaterialType(); } @@ -304,6 +308,10 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im return dto != null && !dto.isChildrenMultiSelectable() && !isLeaf(); } + public void computeValidationValidState() { + getUserObject().computeValidationValidState(); + } + //TODO Improve the design, we should not store anything in uiModel and separate leaving and arriving data private static class FloatingObjectPartsTreeNodeContext { @@ -344,8 +352,6 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im this.editable = false; this.exclusive = false; this.useValidation = false; - this.valueValidOnArriving = true; - this.valueValidOnLeaving = true; this.referentialLocale = ObserveSwingApplicationContext.get().getDecoratorService().getReferentialLocale(); } @@ -357,10 +363,6 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im // editable if dto is selectable (we also make sure that the object material type is here too) this.editable = dto.getObjectMaterialType() != null; this.useValidation = enabled && editable && dto.withValidation(); - if (!useValidation) { - valueValidOnArriving = true; - valueValidOnLeaving = true; - } // exclusive if his parent requires it this.exclusive = parent.dto != null && !parent.dto.isChildrenMultiSelectable(); this.referentialLocale = ObserveSwingApplicationContext.get().getDecoratorService().getReferentialLocale(); @@ -411,9 +413,9 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im boolean isValid(int column) { switch (column) { case 1: // when arriving - return validWhenArriving; + return validWhenArriving && (!useValidation || valueValidOnArriving); case 2: // when leaving - return validWhenLeaving; + return validWhenLeaving && (!useValidation || valueValidOnLeaving); } throw new IllegalStateException(); } @@ -429,5 +431,15 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im return text; } + public void computeValidationValidState() { + if (uiModel.isArriving()) { + Object value = uiModel.getWhenArriving(dto.getId()); + valueValidOnArriving = dto.isValid(value); + } + if (uiModel.isLeaving()) { + Object value = uiModel.getWhenLeaving(dto.getId()); + valueValidOnLeaving = dto.isValid(value); + } + } } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/dcp/FloatingObjectPartsTreeTable.java ===================================== @@ -83,7 +83,7 @@ public class FloatingObjectPartsTreeTable extends JXTreeTable { } FloatingObjectPartsTreeTableModel treeTableModel = getTreeTableModel(); - treeTableModel.reset(); + treeTableModel.reset(true); if (expandTree) { expandAll(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/dcp/FloatingObjectPartsTreeTableModel.java ===================================== @@ -50,6 +50,7 @@ public class FloatingObjectPartsTreeTableModel extends DefaultTreeTableModel { private ImmutableSet<FloatingObjectPartsTreeNode> allNodes; private ImmutableSet<FloatingObjectPartsTreeNode> needOneSelectionNodes; private ImmutableSet<FloatingObjectPartsTreeNode> mandatoryNodes; + private ImmutableSet<FloatingObjectPartsTreeNode> validationNodes; private boolean adjusting; public FloatingObjectPartsTreeTableModel(FloatingObjectUIModel uiModel) { @@ -73,6 +74,7 @@ public class FloatingObjectPartsTreeTableModel extends DefaultTreeTableModel { ImmutableSet.Builder<FloatingObjectPartsTreeNode> needOneSelectionNodesBuilder = ImmutableSet.builder(); ImmutableSet.Builder<FloatingObjectPartsTreeNode> mandatoryNodesBuilder = ImmutableSet.builder(); + ImmutableSet.Builder<FloatingObjectPartsTreeNode> validationNodesBuilder = ImmutableSet.builder(); for (FloatingObjectPartsTreeNode node : allNodes) { if (!node.isEnabled()) { @@ -83,9 +85,13 @@ public class FloatingObjectPartsTreeTableModel extends DefaultTreeTableModel { if (node.withMandatoryConstraintsOnChildren()) { needOneSelectionNodesBuilder.add(node); } + if (node.withValidation()) { + validationNodesBuilder.add(node); + } } needOneSelectionNodes = needOneSelectionNodesBuilder.build(); mandatoryNodes = mandatoryNodesBuilder.build(); + validationNodes = validationNodesBuilder.build(); } public void rebuildRootNode(ObjectMaterialHierarchyDto materials) { @@ -120,12 +126,15 @@ public class FloatingObjectPartsTreeTableModel extends DefaultTreeTableModel { if (adjusting) { return; } - reset(); + reset(false); uiModel.setModified(true); } - public void reset() { + public void reset(boolean computeValidation) { allNodes.forEach(FloatingObjectPartsTreeNode::resetStates); + if (computeValidation) { + validationNodes.forEach(FloatingObjectPartsTreeNode::computeValidationValidState); + } boolean whenArriving = uiModel.isArriving(); boolean whenLeaving = uiModel.isLeaving(); @@ -144,7 +153,7 @@ public class FloatingObjectPartsTreeTableModel extends DefaultTreeTableModel { public void setAdjusting(boolean adjusting) { this.adjusting = adjusting; if (!adjusting) { - reset(); + reset(false); uiModel.setModified(true); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4a398696450824a3ccce0d58276… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4a398696450824a3ccce0d58276… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [PS] Formulaire FOB : les contrôles de saisie ne sont pas appliqués - Closes #1234
by Tony CHEMIT Feb. 19, 2019

Feb. 19, 2019

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 35aae06f by tchemit at 2019-02-19T11:19:47Z [PS] Formulaire FOB : les contrôles de saisie ne sont pas appliqués - Closes #1234 - - - - - 5 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeTable.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeTableModel.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java ===================================== @@ -375,7 +375,7 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, getModel().setLeaving(operation.isWhenLeaving()); } FloatingObjectPartsTreeTableModel treeModel = getUi().getTable().getTreeTableModel(); - treeModel.reset(); + treeModel.reset(true); } protected void computeTabValidState(SwingValidatorMessageTableModel errorTableModel) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIModel.java ===================================== @@ -240,4 +240,13 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { firePropertyChange(PROPERTY_LEAVING, leaving); } + public Object getWhenArriving(String id) { + ObjectMaterialDto dto = Objects.requireNonNull(referentialMap.get(id)); + return whenArriving.get(dto); + } + + public Object getWhenLeaving(String id) { + ObjectMaterialDto dto = Objects.requireNonNull(referentialMap.get(id)); + return whenLeaving.get(dto); + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeNode.java ===================================== @@ -73,7 +73,7 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im } boolean isNotValid() { - return !(getUserObject().validWhenArriving && getUserObject().validWhenLeaving); + return !(isValid(1) && isValid(2)); } @Override @@ -153,6 +153,10 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im return getUserObject().dto.isFloat(); } + public boolean withValidation() { + return getUserObject().dto.withValidation(); + } + ObjectMaterialTypeReference getObjectMaterialType() { return getUserObject().dto.getObjectMaterialType(); } @@ -305,6 +309,10 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im return dto != null && !dto.isChildrenMultiSelectable() && !isLeaf(); } + public void computeValidationValidState() { + getUserObject().computeValidationValidState(); + } + //TODO Improve the design, we should not store anything in uiModel and separate leaving and arriving data private static class FloatingObjectPartsTreeNodeContext { @@ -345,8 +353,6 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im this.editable = false; this.exclusive = false; this.useValidation = false; - this.valueValidOnArriving = true; - this.valueValidOnLeaving = true; this.referentialLocale = ObserveSwingApplicationContext.get().getDecoratorService().getReferentialLocale(); } @@ -358,10 +364,6 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im // editable if dto is selectable (we also make sure that the object material type is here too) this.editable = dto.getObjectMaterialType() != null; this.useValidation = enabled && editable && dto.withValidation(); - if (!useValidation) { - valueValidOnArriving = true; - valueValidOnLeaving = true; - } // exclusive if his parent requires it this.exclusive = parent.dto != null && !parent.dto.isChildrenMultiSelectable(); this.referentialLocale = ObserveSwingApplicationContext.get().getDecoratorService().getReferentialLocale(); @@ -412,9 +414,9 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im boolean isValid(int column) { switch (column) { case 1: // when arriving - return validWhenArriving; + return validWhenArriving && (!useValidation || valueValidOnArriving); case 2: // when leaving - return validWhenLeaving; + return validWhenLeaving && (!useValidation || valueValidOnLeaving); } throw new IllegalStateException(); } @@ -430,5 +432,15 @@ public class FloatingObjectPartsTreeNode extends AbstractMutableTreeTableNode im return text; } + public void computeValidationValidState() { + if (uiModel.isArriving()) { + Object value = uiModel.getWhenArriving(dto.getId()); + valueValidOnArriving = dto.isValid(value); + } + if (uiModel.isLeaving()) { + Object value = uiModel.getWhenLeaving(dto.getId()); + valueValidOnLeaving = dto.isValid(value); + } + } } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeTable.java ===================================== @@ -83,7 +83,7 @@ public class FloatingObjectPartsTreeTable extends JXTreeTable { } FloatingObjectPartsTreeTableModel treeTableModel = getTreeTableModel(); - treeTableModel.reset(); + treeTableModel.reset(true); if (expandTree) { expandAll(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/dcp/FloatingObjectPartsTreeTableModel.java ===================================== @@ -50,6 +50,7 @@ public class FloatingObjectPartsTreeTableModel extends DefaultTreeTableModel { private ImmutableSet<FloatingObjectPartsTreeNode> allNodes; private ImmutableSet<FloatingObjectPartsTreeNode> needOneSelectionNodes; private ImmutableSet<FloatingObjectPartsTreeNode> mandatoryNodes; + private ImmutableSet<FloatingObjectPartsTreeNode> validationNodes; private boolean adjusting; public FloatingObjectPartsTreeTableModel(FloatingObjectUIModel uiModel) { @@ -73,6 +74,7 @@ public class FloatingObjectPartsTreeTableModel extends DefaultTreeTableModel { ImmutableSet.Builder<FloatingObjectPartsTreeNode> needOneSelectionNodesBuilder = ImmutableSet.builder(); ImmutableSet.Builder<FloatingObjectPartsTreeNode> mandatoryNodesBuilder = ImmutableSet.builder(); + ImmutableSet.Builder<FloatingObjectPartsTreeNode> validationNodesBuilder = ImmutableSet.builder(); for (FloatingObjectPartsTreeNode node : allNodes) { if (!node.isEnabled()) { @@ -82,9 +84,13 @@ public class FloatingObjectPartsTreeTableModel extends DefaultTreeTableModel { if (node.withMandatoryConstraintsOnChildren()) { needOneSelectionNodesBuilder.add(node); } + if (node.withValidation()) { + validationNodesBuilder.add(node); + } } needOneSelectionNodes = needOneSelectionNodesBuilder.build(); mandatoryNodes = mandatoryNodesBuilder.build(); + validationNodes = validationNodesBuilder.build(); } public void rebuildRootNode(ObjectMaterialHierarchyDto materials) { @@ -119,12 +125,15 @@ public class FloatingObjectPartsTreeTableModel extends DefaultTreeTableModel { if (adjusting) { return; } - reset(); + reset(false); uiModel.setModified(true); } - public void reset() { + public void reset(boolean computeValidation) { allNodes.forEach(FloatingObjectPartsTreeNode::resetStates); + if (computeValidation) { + validationNodes.forEach(FloatingObjectPartsTreeNode::computeValidationValidState); + } boolean whenArriving = uiModel.isArriving(); boolean whenLeaving = uiModel.isLeaving(); @@ -143,7 +152,7 @@ public class FloatingObjectPartsTreeTableModel extends DefaultTreeTableModel { public void setAdjusting(boolean adjusting) { this.adjusting = adjusting; if (!adjusting) { - reset(); + reset(false); uiModel.setModified(true); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/35aae06ffcac36f928db16091c4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/35aae06ffcac36f928db16091c4… You're receiving this email because of your account on gitlab.com.

1 0