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

[Git][ultreiaio/ird-observe][develop] update CHANGELOG [skip ci]
by Tony CHEMIT Jan. 20, 2021

Jan. 20, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 72e4976e by Tony Chemit at 2021-01-20T15:51:02+01:00 update CHANGELOG [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,15 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2021-01-18 17:45. + * Last generated at 2021-01-20 15:49. + +## Version [8.0.4](https://gitlab.com/ultreiaio/ird-observe/-/milestones/178) + +**Closed at 2021-01-19.** + + +### Issues + * [[Anomalie 1762]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1762) **Problème de digit TargetLength.weight à 1 au lieu de 3** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [8.0.3](https://gitlab.com/ultreiaio/ird-observe/-/milestones/176) @@ -445,6 +453,18 @@ Merry Christmas * [[Evolution 1181]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1181) **Ajouter un champ vessel.lloydid** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Evolution 1183]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1183) **[V8][DATA MODEL] Transformer Vessel.fleetcountry (int4) en topiaid** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) +## Version [7.6.7](https://gitlab.com/ultreiaio/ird-observe/-/milestones/174) + +**Closed at 2021-01-20.** + + +### Issues + * [[Anomalie 1755]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1755) **Problème d'enregistrement sur avançon depuis le formulaire capture** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1756]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1756) **Problème dans la gestion des onglets du formulaire 'Avançon'** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1757]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1757) **Souci de gestion sur 12h du champ 'Temps depuis déclenchement'** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Evolution 1625]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1625) **[LL][Observations] Horodatage hook timers par défaut** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) + * [[Evolution 1754]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1754) **Découplage case 'Horloge' et champ 'Horodatage de montée à bord'** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + ## Version [7.6.6](https://gitlab.com/ultreiaio/ird-observe/-/milestones/170) **Closed at 2020-11-01.** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/72e4976e9bbf63657287fa850… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/72e4976e9bbf63657287fa850… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.6.7
by Tony CHEMIT Jan. 20, 2021

Jan. 20, 2021

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

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v7.6.7
by Tony CHEMIT Jan. 20, 2021

Jan. 20, 2021

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

1 0

[Git][ultreiaio/ird-observe][release/7.6.7] [jgitflow-maven-plugin]updating poms for branch'release/7.6.7' with non-snapshot versions[skip ci]
by Tony CHEMIT Jan. 20, 2021

Jan. 20, 2021

Tony CHEMIT pushed to branch release/7.6.7 at ultreiaio / ird-observe Commits: 67bd7b11 by Tony Chemit at 2021-01-20T15:37:02+01:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.7' with non-snapshot versions[skip ci] - - - - - 22 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/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 - templates/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <artifactId>services</artifactId> ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.7</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/67bd7b11941d7b76de25d3f39… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/67bd7b11941d7b76de25d3f39… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-7.x] 16 commits: [jgitflow-maven-plugin]updating poms for 7.6.7-SNAPSHOT development[skip ci]
by Tony CHEMIT Jan. 20, 2021

Jan. 20, 2021

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 91381479 by Tony Chemit at 2020-11-04T10:23:03+01:00 [jgitflow-maven-plugin]updating poms for 7.6.7-SNAPSHOT development[skip ci] - - - - - 1adf5463 by Tony Chemit at 2020-11-04T10:35:12+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 9f91794b by Tony Chemit at 2020-11-04T10:35:13+01:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 021cbd03 by Tony Chemit at 2020-11-04T10:35:14+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 00213e9a by Tony Chemit at 2020-11-25T15:47:50+01:00 Fix isValidId method (Possibilité de forcer le topiaid sur tous les écrans de création des référentiels - See #1328) - - - - - be2566af by Tony Chemit at 2021-01-14T21:43:47+01:00 Souci de gestion sur 12h du champ 'Temps depuis déclenchement' - Closes #1757 - - - - - 96d93595 by Tony Chemit at 2021-01-14T21:47:56+01:00 Souci de gestion sur 12h du champ 'Temps depuis déclenchement' - Closes #1757 - - - - - b2148594 by Tony Chemit at 2021-01-14T21:57:38+01:00 Problème d'enregistrement sur avançon depuis le formulaire capture - Closes #1755 - - - - - 50026873 by Tony Chemit at 2021-01-14T22:40:23+01:00 Découplage case 'Horloge' et champ 'Horodatage de montée à bord' - Closes #1754 - - - - - f96ea336 by Tony Chemit at 2021-01-14T23:10:27+01:00 Découplage case 'Horloge' et champ 'Horodatage de montée à bord' - Closes #1754 Clean timeSinceContact when timer is off. - - - - - 33140d2d by Tony Chemit at 2021-01-14T23:41:07+01:00 fix dependencies - - - - - 3276c422 by Tony Chemit at 2021-01-19T15:12:40+01:00 [LL][Observations] Horodatage hook timers par défaut - Closes #1625 Découplage case 'Horloge' et champ 'Horodatage de montée à bord' - Closes #1754 Problème dans la gestion des onglets du formulaire 'Avançon' - Closes #1756 - - - - - 117a98c1 by Tony Chemit at 2021-01-20T10:52:24+01:00 Problème dans la gestion des onglets du formulaire 'Avançon' - Closes #1756 (on v7) - - - - - 32bd7168 by Tony Chemit at 2021-01-20T11:24:27+01:00 Problème dans la gestion des onglets du formulaire 'Avançon' - Closes #1756 (on v7) formulaire composition détaillée - - - - - 67bd7b11 by Tony Chemit at 2021-01-20T15:37:02+01:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.7' with non-snapshot versions[skip ci] - - - - - abc4f488 by Tony Chemit at 2021-01-20T15:45:06+01:00 [jgitflow-maven-plugin]merging 'release/7.6.7' into 'master-7.x' - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/BranchlineSetDefaultTimerTimeOnBoard.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/CatchSetDefaultTimerTimeOnBoard.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/SetDefaultTimerTimeOnBoard.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesTableModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineDetailCompositionUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java - + client-core/src/main/java/fr/ird/observe/client/ui/util/time/UnlimitedTimeEditor.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/util/time/UnlimitedTimeEditor.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/util/time/UnlimitedTimeEditorHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/util/time/UnlimitedTimeEditorModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/util/time/actions/UnlimitedTimeEditorResetAction.java - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaIdFactory.java - common-service/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/21ee0b484cfcac0c930265b9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/21ee0b484cfcac0c930265b9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.6.7' with non-snapshot versions[skip ci]
by Tony CHEMIT Jan. 20, 2021

Jan. 20, 2021

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 67bd7b11 by Tony Chemit at 2021-01-20T15:37:02+01:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.7' with non-snapshot versions[skip ci] - - - - - abc4f488 by Tony Chemit at 2021-01-20T15:45:06+01:00 [jgitflow-maven-plugin]merging 'release/7.6.7' into 'master-7.x' - - - - - 2ed0891c by Tony Chemit at 2021-01-20T15:45:08+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - a505e190 by Tony Chemit at 2021-01-20T15:45:08+01:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - f3b43eb2 by Tony Chemit at 2021-01-20T15:45:09+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/adc37e8aa25e0b63ed00e015… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/adc37e8aa25e0b63ed00e015… You're receiving this email because of your account on gitlab.com.

1 0

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

Jan. 20, 2021

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: adc37e8a by Tony Chemit at 2021-01-20T15:36:04+01:00 [jgitflow-maven-plugin]updating poms for 7.6.8-SNAPSHOT development[skip ci] - - - - - 22 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/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 - templates/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.7-SNAPSHOT</version> + <version>7.6.8-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/adc37e8aa25e0b63ed00e015d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/adc37e8aa25e0b63ed00e015d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.6.7
by Tony CHEMIT Jan. 20, 2021

Jan. 20, 2021

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

1 0

[Git][ultreiaio/ird-observe][feature/1254] 2 commits: Revert bad replaces
by Tony CHEMIT Jan. 20, 2021

Jan. 20, 2021

Tony CHEMIT pushed to branch feature/1254 at ultreiaio / ird-observe Commits: 298645ca by Tony Chemit at 2021-01-20T14:51:45+01:00 Revert bad replaces - - - - - 0498c7e8 by Tony Chemit at 2021-01-20T15:34:02+01:00 Les tests passent jusqu'aux services :) Il ne reste plus qu'à modifier les ui (peace of cake) - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetNonTargetCatchUI.jaxx - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/observation/SetNonTargetCatchUINavigationNode.scope - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - doc/modelisation/zargo/v5/observe.ini - doc/modelisation/zargo/v7/observe.ini - models/dto-definition/src/main/models/Observe-20-data-ps-observation.model - models/dto/src/main/resources/observe-reports.properties - models/persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_9_0.java - models/persistence/src/main/models/Observe-20-data-ps-observation.model - + models/persistence/src/main/resources/db/migration/9.0/03_ps_observation_merge_catches-create-common.sql - models/persistence/src/main/resources/db/migration/9.0/03_ps_observation_merge_catches-common.sql → models/persistence/src/main/resources/db/migration/9.0/03_ps_observation_merge_catches-fill-common.sql - + models/persistence/src/main/resources/db/migration/9.0/03_ps_observation_merge_catches-finalize-common.sql - models/persistence/src/main/resources/db/migration/9.0/04_ps_observation_drop_tables-H2.sql - models/persistence/src/main/resources/db/migration/9.0/04_ps_observation_drop_tables-PG.sql - models/persistence/src/main/resources/db/migration/9.0/observe_create-schema-H2.sql - models/persistence/src/main/resources/db/migration/9.0/observe_create-schema-PG.sql - models/persistence/src/main/resources/db/migration/9.0/observe_full-schema-H2.sql - models/persistence/src/main/resources/db/migration/9.0/observe_full-schema-PG.sql - models/persistence/src/test/resources/fixtures/persistence/count-data-seine-1.properties - models/persistence/src/test/resources/fixtures/persistence/count-data-seine-2.properties - models/persistence/src/test/resources/fixtures/persistence/count-data-seine-3.properties - models/persistence/src/test/resources/fixtures/persistence/count-referential-common.properties - models/persistence/src/test/resources/fixtures/persistence/count-referential-seine.properties - models/persistence/src/test/resources/fixtures/persistence/entity-associations-count-referential.properties - models/persistence/src/test/resources/fixtures/persistence/entity-paths-count.properties - models/persistence/src/test/resources/fixtures/persistence/entity-paths-links-count.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8727e7192185d6f1510a1f9b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8727e7192185d6f1510a1f9b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Problème dans la gestion des onglets du formulaire 'Avançon' - Closes #1756 (on v7)
by Tony CHEMIT Jan. 20, 2021

Jan. 20, 2021

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 32bd7168 by Tony Chemit at 2021-01-20T11:24:27+01:00 Problème dans la gestion des onglets du formulaire 'Avançon' - Closes #1756 (on v7) formulaire composition détaillée - - - - - 9 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jaxx ===================================== @@ -34,6 +34,7 @@ fr.ird.observe.client.ui.actions.content.BranchlineSetDefaultTimerTimeOnBoard fr.ird.observe.client.ui.util.JComment + fr.ird.observe.client.ui.util.time.UnlimitedTimeEditor org.nuiton.jaxx.widgets.number.NumberEditor io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox @@ -122,7 +123,7 @@ public void edit(BranchlineDto branchline) { getHandler().edit(branchline); } <JCheckBox id='timer' styleClass="i18n"/> </cell> <cell columns="2"> - <TimeEditor id='timeSinceContact' constructorParams='this'/> + <UnlimitedTimeEditor id='timeSinceContact' constructorParams='this'/> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jcss ===================================== @@ -64,13 +64,13 @@ propertyTime:{BranchlineDto.PROPERTY_TIME_SINCE_CONTACT}; time:{model.getTimeSinceContact()}; bean:{model}; - showTimeEditorSlider:false; + showReset:true; } #timerTimeOnBoard { date:{bean.getTimerTimeOnBoard()}; - showTimeEditorSlider:false; propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD}; + showReset:true; } #topType { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIHandler.java ===================================== @@ -32,24 +32,23 @@ import fr.ird.observe.client.ui.content.ObserveLayoutFocusTraversalPolicy; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.dto.data.longline.BranchlineDto; import fr.ird.observe.dto.data.longline.BranchlineHelper; +import io.ultreia.java4all.i18n.I18n; import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.decorator.Decorator; -import io.ultreia.java4all.i18n.I18n; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; -import org.nuiton.util.DateUtil; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JOptionPane; import javax.swing.event.TableModelListener; import java.awt.Component; import java.awt.Container; -import java.util.Calendar; -import java.util.Date; +import java.beans.PropertyChangeListener; import java.util.HashSet; +import java.util.Objects; import java.util.Set; /** @@ -60,22 +59,23 @@ import java.util.Set; */ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, BranchlineUI> implements UIHandler<BranchlineUI> { - /** Logger */ + /** + * Logger + */ private static final Logger log = LogManager.getLogger(BranchlineUIHandler.class); // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener; - + private final PropertyChangeListener timerChanged; private Decorator<BranchlineDto> branchlineDecorator; public BranchlineUIHandler() { super(DataContextType.SetLongline, null); computeTabValidStateListener = e -> { - SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); computeTabValidState(source); - }; + timerChanged = evt -> onTimerChanged((Boolean) evt.getNewValue()); } @Override @@ -112,6 +112,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl evt -> getUi().getValidator().setChanged(true)); ui.getTimerTimeOnBoard().getSliderHidorToolBar().setVisible(true); + ui.getTimerTimeOnBoard().getSliderHidor().setVisible(false); ui.getTimerTimeOnBoard().getSliderHidorToolBar().add(ui.getSetDefaultTimerTimeOnBoard()); } @@ -127,10 +128,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl BranchlineHelper.copyBranchlineDto(branchline, getBean()); if (branchline == null) { - - Date timeSinceContactDate = DateUtil.createDate(0, 0, 0, 0, 0, 0); - model.setTimeSinceContact(timeSinceContactDate); - + model.setTimeSinceContact(null); // stop edit stopEditUI(); @@ -138,13 +136,9 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl if (BooleanUtils.isTrue(branchline.getTimer())) { Long timeSinceContact = branchline.getTimeSinceContact(); - if (timeSinceContact != null) { - Date timeSinceContactDate = DateUtil.createDate(0, (int) (timeSinceContact % 60), (int) (timeSinceContact / 60f), 0, 0, 0); - model.setTimeSinceContact(timeSinceContactDate); - } + model.setTimeSinceContact(timeSinceContact==null?null:timeSinceContact.intValue()); } else { - Date timeSinceContactDate = DateUtil.createDate(0, 0, 0, 0, 0, 0); - model.setTimeSinceContact(timeSinceContactDate); + model.setTimeSinceContact(null); } if (model.isEnabled() && !model.isEditing()) { @@ -203,9 +197,6 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl log.info("OpenUI: " + getModel()); } - getUi().getTimeSinceContact().getSliderHidor().setVisible(false); - getUi().getTimerTimeOnBoard().getSliderHidor().setVisible(false); - boolean canWrite = computeCanWrite(getDataSource()); getModel().setCanWrite(canWrite); @@ -258,10 +249,19 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl BranchlineUI.BINDING_TIMER_TIME_ON_BOARD_DATE ); + ui.getBean().removePropertyChangeListener(BranchlineDto.PROPERTY_TIMER, timerChanged); + ui.getBean().addPropertyChangeListener(BranchlineDto.PROPERTY_TIMER, timerChanged); + model.setModified(false); } + @Override + public void stopEditUI() { + ui.getBean().removePropertyChangeListener(BranchlineDto.PROPERTY_TIMER, timerChanged); + super.stopEditUI(); + } + @Override protected boolean doSave(BranchlineDto bean) { @@ -270,18 +270,13 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl BranchlineHelper.copyBranchlineDto(bean, beanToSave); if (BooleanUtils.isTrue(bean.getTimer())) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(getModel().getTimeSinceContact()); - int minutes = calendar.get(Calendar.MINUTE); - int hours = calendar.get(Calendar.HOUR_OF_DAY); - beanToSave.setTimeSinceContact(minutes + 60L * hours); + Integer timeSinceContact = getModel().getTimeSinceContact(); + beanToSave.setTimeSinceContact(timeSinceContact == null ? null : timeSinceContact.longValue()); } else { beanToSave.setTimeSinceContact(null); } - if (log.isInfoEnabled()) { - log.info("Time since contact: " + beanToSave.getTimeSinceContact()); - } + log.info(String.format("Save time since contact: %d", beanToSave.getTimeSinceContact())); // for external models getModel().fireSaved(); @@ -417,4 +412,13 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl } + void onTimerChanged(Boolean newValue) { + if (Objects.equals(true, newValue)) { + // with timer + ui.getModel().setTimeSinceContact(0); + } else { + // without timer + ui.getModel().setTimeSinceContact(null); + } + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIModel.java ===================================== @@ -73,7 +73,7 @@ public class BranchlineUIModel extends ContentUIModel<BranchlineDto> { private boolean hookAndBaitTabValid; - private Date timeSinceContact; + private Integer timeSinceContact; private Date haulingStartTimeStamp; public BranchlineUIModel() { @@ -106,13 +106,14 @@ public class BranchlineUIModel extends ContentUIModel<BranchlineDto> { firePropertyChange(PROPERTY_HOOK_AND_BAIT_TAB_VALID, null, hookAndBaitTabValid); } - public Date getTimeSinceContact() { + public Integer getTimeSinceContact() { return timeSinceContact; } - public void setTimeSinceContact(Date timeSinceContact) { + public void setTimeSinceContact(Integer timeSinceContact) { + Integer oldValue = getTimeSinceContact(); this.timeSinceContact = timeSinceContact; - firePropertyChange(BranchlineDto.PROPERTY_TIME_SINCE_CONTACT, null, getTimeSinceContact()); + firePropertyChange(BranchlineDto.PROPERTY_TIME_SINCE_CONTACT, oldValue, getTimeSinceContact()); } // For external model known when a saved action was done ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jcss ===================================== @@ -338,7 +338,6 @@ JCheckBox { date:{branchlineBean.getTimerTimeOnBoard()}; propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD}; bean:{branchlineBean}; - showTimeEditorSlider:false; showReset:true; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java ===================================== @@ -252,7 +252,6 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat ui.getTimerTimeOnBoard().getSliderHidorToolBar().setVisible(true); ui.getTimerTimeOnBoard().getSliderHidor().setVisible(false); ui.getTimerTimeOnBoard().getSliderHidorToolBar().add(ui.getSetDefaultTimerTimeOnBoard()); -// ui.getTimeSinceContact().getReset().setVisible(true); } @Override ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1,4 +1,5 @@ ClientConfig.description=ObServe configuration +DateTimeEditor.action.reset.tip=Reset ObserveWebApplicationConfig.description=ObServe Web configuration TimeEditor.H=H observe.action.about=About ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1,4 +1,5 @@ ClientConfig.description=Configuración de ObServe +DateTimeEditor.action.reset.tip=Cancelar ObserveWebApplicationConfig.description=Configuración de Observe web TimeEditor.H=H observe.action.about=Acerca de ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1,4 +1,5 @@ ClientConfig.description=Configuration d'ObServe +DateTimeEditor.action.reset.tip=Réinitialiser la valeur ObserveWebApplicationConfig.description=Observe web Configuration TimeEditor.H=H observe.action.about=À propos View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/32bd71682b812db55e4244c4e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/32bd71682b812db55e4244c4e… You're receiving this email because of your account on gitlab.com.

1 0