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

[Git][ultreiaio/ird-observe] Pushed new tag v7.0-RC-14
by Tony CHEMIT 18 Jun '18

18 Jun '18

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

1 0

[Git][ultreiaio/ird-observe][release/7.0-RC-14] 2 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-14' with…
by Tony CHEMIT 18 Jun '18

18 Jun '18

Tony CHEMIT pushed to branch release/7.0-RC-14 at ultreiaio / ird-observe Commits: e17076c3 by Tony CHEMIT at 2018-06-18T06:22:17Z [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-14' with non-snapshot versions[skip ci] - - - - - 3c7b1111 by Tony CHEMIT at 2018-06-18T06:35:41Z fix release - - - - - 15 changed files: - client-configuration/pom.xml - client/pom.xml - dto/pom.xml - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-14</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-14</version> </parent> <artifactId>client</artifactId> ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-14</version> </parent> <artifactId>dto</artifactId> ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java +++ b/dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java @@ -1,5 +1,27 @@ package fr.ird.observe.dto.decoration.decorators; +/*- + * #%L + * ObServe :: Dto + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.dto.referential.GearCaracteristicDto; import static org.nuiton.i18n.I18n.t; ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java +++ b/dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java @@ -1,5 +1,27 @@ package fr.ird.observe.dto.decoration.decorators; +/*- + * #%L + * ObServe :: Dto + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.dto.referential.GearCaracteristicDto; import fr.ird.observe.dto.referential.GearCaracteristicReference; ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-14</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-14</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-14</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== --- a/server-configuration/pom.xml +++ b/server-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-14</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== --- a/server/pom.xml +++ b/server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-14</version> </parent> <artifactId>server</artifactId> ===================================== services-client/pom.xml ===================================== --- a/services-client/pom.xml +++ b/services-client/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-14</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== --- a/services-local/pom.xml +++ b/services-local/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-14</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-14</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-14</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-14</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/29225f10ba637b109c4aeca9a2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/29225f10ba637b109c4aeca9a2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-7.x] 29 commits: [jgitflow-maven-plugin]updating poms for 7.0-RC-14-SNAPSHOT development[skip ci]
by Tony CHEMIT 18 Jun '18

18 Jun '18

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 1aa2bc75 by Tony CHEMIT at 2018-05-17T14:48:24Z [jgitflow-maven-plugin]updating poms for 7.0-RC-14-SNAPSHOT development[skip ci] - - - - - 36a53956 by Tony CHEMIT at 2018-05-17T15:25:15Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 2a9ae0ca by Tony CHEMIT at 2018-05-17T15:25:15Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - a08b1e05 by Tony CHEMIT at 2018-05-17T15:25:16Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 706d00c5 by Tony CHEMIT at 2018-05-17T15:39:59Z update changelog after release 7.0-RC-13 [skip ci] - - - - - 1aab0084 by Tony CHEMIT at 2018-05-18T14:45:10Z use last pom (with gitlab cache) - - - - - 64ce28aa by Tony CHEMIT at 2018-05-18T15:07:52Z do not keep project (since it is generated each time) - - - - - 1f6f214d by Tony CHEMIT at 2018-05-18T16:06:18Z Add more jobs [skip ci] - - - - - 80d177b2 by Tony CHEMIT at 2018-05-18T16:07:47Z use next version - - - - - cd9c6480 by Tony CHEMIT at 2018-06-18T06:20:16Z update jgitflow configuraiton - - - - - d87ac584 by Tony CHEMIT at 2018-06-18T06:20:20Z Set maintenance brance (for 7.x) - - - - - f19cd6ae by Tony CHEMIT at 2018-06-18T06:20:20Z [PS] Sur marée PS, les bateaux présentés sont les palangriers - Closes #954 - - - - - 278ec3b2 by Tony CHEMIT at 2018-06-18T06:20:20Z [GEAR] Page des caractéristiques d'équipements -> afficher l'unité attendue - Closes #955 - - - - - 082bcd3b by Tony CHEMIT at 2018-06-18T06:20:20Z [GEAR] Page des caractéristiques d'équipements -> ordonancement des caractéristiques - Closes #956 - - - - - be8c5bd7 by Tony CHEMIT at 2018-06-18T06:20:20Z [REFERENTIEL] Une erreur s'est glissée dans le référentiel SizeMeasureType - Closes #966 - - - - - 6ec84ad6 by Tony CHEMIT at 2018-06-18T06:20:21Z Validation système observé / RHN - Closes #973 - - - - - 69353356 by Tony CHEMIT at 2018-06-18T06:20:21Z -m[REFERENTIEL] L'écran du référentiel taille-poids plante à son ouverture - Closes #964 - - - - - 9403cc67 by Tony CHEMIT at 2018-06-18T06:20:21Z [REFERENTIEL] L'écran du référentiel taille-taille plante - Closes #965 - - - - - 3092f707 by Tony CHEMIT at 2018-06-18T06:20:21Z [REFERENTIEL] Lien entre lengthlengthparameter et species ? - Closes #962 - - - - - e13fd1b5 by Tony CHEMIT at 2018-06-18T06:20:22Z Page des caractéristiques d'équipements -> champs texte tronqués à l'affichage - Closes #957 - - - - - d7d83052 by Tony CHEMIT at 2018-06-18T06:20:22Z Des racourcis clavier interfèrent avec l'autocomplétion des listes déroulantes - Closes #953 - - - - - c0b988cd by Tony CHEMIT at 2018-06-18T06:20:22Z Barre de progression sur calcul de données - Closes #963 - - - - - 235cefdd by Tony CHEMIT at 2018-06-18T06:20:22Z Fix data widget binding - - - - - 239a81c2 by Tony CHEMIT at 2018-06-18T06:20:22Z [PS] Formulaire DCP / matériaux / Couleur de surbrillance - Closes #969 - - - - - 4dce4812 by Tony CHEMIT at 2018-06-18T06:20:22Z L'algo de calcul de données plante sur la base attachée - Closes #972 - Closes #967 - - - - - 29225f10 by Tony CHEMIT at 2018-06-18T06:20:23Z [REFERENTIEL] Lien entre lengthlengthparameter et species ? - See #962 - - - - - e17076c3 by Tony CHEMIT at 2018-06-18T06:22:17Z [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-14' with non-snapshot versions[skip ci] - - - - - 3c7b1111 by Tony CHEMIT at 2018-06-18T06:35:41Z fix release - - - - - 3d84bb94 by Tony CHEMIT at 2018-06-18T06:36:14Z [jgitflow-maven-plugin]merging 'release/7.0-RC-14' into 'master-7.x' - - - - - 30 changed files: - .gitignore - .gitlab-ci.yml - + .mvn/gitlab-cache/milestones/268594-artifacts.json - + .mvn/gitlab-cache/milestones/268594-issues.json - + .mvn/gitlab-cache/milestones/268594.json - + .mvn/gitlab-cache/milestones/268595-artifacts.json - + .mvn/gitlab-cache/milestones/268595-issues.json - + .mvn/gitlab-cache/milestones/268595.json - + .mvn/gitlab-cache/milestones/268596-artifacts.json - + .mvn/gitlab-cache/milestones/268596-issues.json - + .mvn/gitlab-cache/milestones/268596.json - + .mvn/gitlab-cache/milestones/268597-artifacts.json - + .mvn/gitlab-cache/milestones/268597-issues.json - + .mvn/gitlab-cache/milestones/268597.json - + .mvn/gitlab-cache/milestones/268598-artifacts.json - + .mvn/gitlab-cache/milestones/268598-issues.json - + .mvn/gitlab-cache/milestones/268598.json - + .mvn/gitlab-cache/milestones/268599-artifacts.json - + .mvn/gitlab-cache/milestones/268599-issues.json - + .mvn/gitlab-cache/milestones/268599.json - + .mvn/gitlab-cache/milestones/268600-artifacts.json - + .mvn/gitlab-cache/milestones/268600-issues.json - + .mvn/gitlab-cache/milestones/268600.json - + .mvn/gitlab-cache/milestones/268601-artifacts.json - + .mvn/gitlab-cache/milestones/268601-issues.json - + .mvn/gitlab-cache/milestones/268601.json - + .mvn/gitlab-cache/milestones/268602-artifacts.json - + .mvn/gitlab-cache/milestones/268602-issues.json - + .mvn/gitlab-cache/milestones/268602.json - + .mvn/gitlab-cache/milestones/268603-artifacts.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d6ab74f79bd89f1e481b05a8f6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d6ab74f79bd89f1e481b05a8f6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 22 commits: update jgitflow configuraiton
by Tony CHEMIT 18 Jun '18

18 Jun '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: cd9c6480 by Tony CHEMIT at 2018-06-18T06:20:16Z update jgitflow configuraiton - - - - - d87ac584 by Tony CHEMIT at 2018-06-18T06:20:20Z Set maintenance brance (for 7.x) - - - - - f19cd6ae by Tony CHEMIT at 2018-06-18T06:20:20Z [PS] Sur marée PS, les bateaux présentés sont les palangriers - Closes #954 - - - - - 278ec3b2 by Tony CHEMIT at 2018-06-18T06:20:20Z [GEAR] Page des caractéristiques d'équipements -> afficher l'unité attendue - Closes #955 - - - - - 082bcd3b by Tony CHEMIT at 2018-06-18T06:20:20Z [GEAR] Page des caractéristiques d'équipements -> ordonancement des caractéristiques - Closes #956 - - - - - be8c5bd7 by Tony CHEMIT at 2018-06-18T06:20:20Z [REFERENTIEL] Une erreur s'est glissée dans le référentiel SizeMeasureType - Closes #966 - - - - - 6ec84ad6 by Tony CHEMIT at 2018-06-18T06:20:21Z Validation système observé / RHN - Closes #973 - - - - - 69353356 by Tony CHEMIT at 2018-06-18T06:20:21Z -m[REFERENTIEL] L'écran du référentiel taille-poids plante à son ouverture - Closes #964 - - - - - 9403cc67 by Tony CHEMIT at 2018-06-18T06:20:21Z [REFERENTIEL] L'écran du référentiel taille-taille plante - Closes #965 - - - - - 3092f707 by Tony CHEMIT at 2018-06-18T06:20:21Z [REFERENTIEL] Lien entre lengthlengthparameter et species ? - Closes #962 - - - - - e13fd1b5 by Tony CHEMIT at 2018-06-18T06:20:22Z Page des caractéristiques d'équipements -> champs texte tronqués à l'affichage - Closes #957 - - - - - d7d83052 by Tony CHEMIT at 2018-06-18T06:20:22Z Des racourcis clavier interfèrent avec l'autocomplétion des listes déroulantes - Closes #953 - - - - - c0b988cd by Tony CHEMIT at 2018-06-18T06:20:22Z Barre de progression sur calcul de données - Closes #963 - - - - - 235cefdd by Tony CHEMIT at 2018-06-18T06:20:22Z Fix data widget binding - - - - - 239a81c2 by Tony CHEMIT at 2018-06-18T06:20:22Z [PS] Formulaire DCP / matériaux / Couleur de surbrillance - Closes #969 - - - - - 4dce4812 by Tony CHEMIT at 2018-06-18T06:20:22Z L'algo de calcul de données plante sur la base attachée - Closes #972 - Closes #967 - - - - - 29225f10 by Tony CHEMIT at 2018-06-18T06:20:23Z [REFERENTIEL] Lien entre lengthlengthparameter et species ? - See #962 - - - - - e17076c3 by Tony CHEMIT at 2018-06-18T06:22:17Z [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-14' with non-snapshot versions[skip ci] - - - - - 3c7b1111 by Tony CHEMIT at 2018-06-18T06:35:41Z fix release - - - - - 3d84bb94 by Tony CHEMIT at 2018-06-18T06:36:14Z [jgitflow-maven-plugin]merging 'release/7.0-RC-14' into 'master-7.x' - - - - - 04c33164 by Tony CHEMIT at 2018-06-18T06:36:16Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 3db4c72a by Tony CHEMIT at 2018-06-18T06:38:12Z fix release - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client/.mvn/pom.gitflow.develop - client/.mvn/pom.gitflow.master - dto/.mvn/pom.gitflow.develop - dto/.mvn/pom.gitflow.master - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java - + dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java~ - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java - + dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java~ - observe/.mvn/pom.gitflow.develop - observe/.mvn/pom.gitflow.master - persistence/.mvn/pom.gitflow.develop - persistence/.mvn/pom.gitflow.master - server-configuration/.mvn/pom.gitflow.develop - server-configuration/.mvn/pom.gitflow.master - server/.mvn/pom.gitflow.develop - server/.mvn/pom.gitflow.master - services-client/.mvn/pom.gitflow.develop - services-client/.mvn/pom.gitflow.master - services-local/.mvn/pom.gitflow.develop - services-local/.mvn/pom.gitflow.master - services/.mvn/pom.gitflow.develop - services/.mvn/pom.gitflow.master - test/.mvn/pom.gitflow.develop - test/.mvn/pom.gitflow.master - validation/.mvn/pom.gitflow.develop - validation/.mvn/pom.gitflow.master Changes: ===================================== .mvn/pom.gitflow.develop ===================================== --- a/.mvn/pom.gitflow.develop +++ b/.mvn/pom.gitflow.develop @@ -1 +1 @@ -develop \ No newline at end of file +develop-7.x \ No newline at end of file ===================================== .mvn/pom.gitflow.master ===================================== --- a/.mvn/pom.gitflow.master +++ b/.mvn/pom.gitflow.master @@ -1 +1 @@ -master \ No newline at end of file +master-7.x \ No newline at end of file ===================================== client-configuration/.mvn/pom.gitflow.develop ===================================== --- a/client-configuration/.mvn/pom.gitflow.develop +++ b/client-configuration/.mvn/pom.gitflow.develop @@ -1 +1 @@ -develop \ No newline at end of file +develop-7.x \ No newline at end of file ===================================== client-configuration/.mvn/pom.gitflow.master ===================================== --- a/client-configuration/.mvn/pom.gitflow.master +++ b/client-configuration/.mvn/pom.gitflow.master @@ -1 +1 @@ -master \ No newline at end of file +master-7.x \ No newline at end of file ===================================== client/.mvn/pom.gitflow.develop ===================================== --- a/client/.mvn/pom.gitflow.develop +++ b/client/.mvn/pom.gitflow.develop @@ -1 +1 @@ -develop \ No newline at end of file +develop-7.x \ No newline at end of file ===================================== client/.mvn/pom.gitflow.master ===================================== --- a/client/.mvn/pom.gitflow.master +++ b/client/.mvn/pom.gitflow.master @@ -1 +1 @@ -master \ No newline at end of file +master-7.x \ No newline at end of file ===================================== dto/.mvn/pom.gitflow.develop ===================================== --- a/dto/.mvn/pom.gitflow.develop +++ b/dto/.mvn/pom.gitflow.develop @@ -1 +1 @@ -develop \ No newline at end of file +develop-7.x \ No newline at end of file ===================================== dto/.mvn/pom.gitflow.master ===================================== --- a/dto/.mvn/pom.gitflow.master +++ b/dto/.mvn/pom.gitflow.master @@ -1 +1 @@ -master \ No newline at end of file +master-7.x \ No newline at end of file ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java +++ b/dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java @@ -1,5 +1,27 @@ package fr.ird.observe.dto.decoration.decorators; +/*- + * #%L + * ObServe :: Dto + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.dto.referential.GearCaracteristicDto; import static org.nuiton.i18n.I18n.t; ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java~ ===================================== --- /dev/null +++ b/dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java~ @@ -0,0 +1,51 @@ +package fr.ird.observe.dto.decoration.decorators; + +<<<<<<< HEAD +======= +/*- + * #%L + * ObServe :: Dto + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +>>>>>>> refs/heads/master-7.x +import fr.ird.observe.dto.referential.GearCaracteristicDto; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created by tchemit on 13/06/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class GearCaracteristicDtoDecorator extends ObserveDecorator<GearCaracteristicDto> { + + public GearCaracteristicDtoDecorator(String libelle) { + super(GearCaracteristicDto.class, "${code}$s##${" + libelle + "}$s##${unit}$s", " "); + } + + @Override + protected Comparable<?> getDefaultNullValue(String token) { + Comparable<?> defaultNullValue = super.getDefaultNullValue(token); + if (defaultNullValue == null && token.equals(GearCaracteristicDto.PROPERTY_UNIT)) { + return t("observe.common.no.unit"); + } + return defaultNullValue; + } +} ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java +++ b/dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java @@ -1,5 +1,27 @@ package fr.ird.observe.dto.decoration.decorators; +/*- + * #%L + * ObServe :: Dto + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.dto.referential.GearCaracteristicDto; import fr.ird.observe.dto.referential.GearCaracteristicReference; ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java~ ===================================== --- /dev/null +++ b/dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java~ @@ -0,0 +1,51 @@ +package fr.ird.observe.dto.decoration.decorators; + +<<<<<<< HEAD +======= +/*- + * #%L + * ObServe :: Dto + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +>>>>>>> refs/heads/master-7.x +import fr.ird.observe.dto.referential.GearCaracteristicDto; +import fr.ird.observe.dto.referential.GearCaracteristicReference; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created by tchemit on 13/06/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class GeatCaracteristicReferenceDecorator extends ReferentialReferenceDecorator<GearCaracteristicReference> { + public GeatCaracteristicReferenceDecorator( ) { + super(GearCaracteristicReference.class, "${code}$s##${label}$s##${unit}$s"); + } + + @Override + protected Comparable<?> getDefaultNullValue(String token) { + Comparable<?> defaultNullValue = super.getDefaultNullValue(token); + if (defaultNullValue == null && token.equals(GearCaracteristicDto.PROPERTY_UNIT)) { + return t("observe.common.no.unit"); + } + return defaultNullValue; + } +} ===================================== observe/.mvn/pom.gitflow.develop ===================================== --- a/observe/.mvn/pom.gitflow.develop +++ b/observe/.mvn/pom.gitflow.develop @@ -1 +1 @@ -develop \ No newline at end of file +develop-7.x \ No newline at end of file ===================================== observe/.mvn/pom.gitflow.master ===================================== --- a/observe/.mvn/pom.gitflow.master +++ b/observe/.mvn/pom.gitflow.master @@ -1 +1 @@ -master \ No newline at end of file +master-7.x \ No newline at end of file ===================================== persistence/.mvn/pom.gitflow.develop ===================================== --- a/persistence/.mvn/pom.gitflow.develop +++ b/persistence/.mvn/pom.gitflow.develop @@ -1 +1 @@ -develop \ No newline at end of file +develop-7.x \ No newline at end of file ===================================== persistence/.mvn/pom.gitflow.master ===================================== --- a/persistence/.mvn/pom.gitflow.master +++ b/persistence/.mvn/pom.gitflow.master @@ -1 +1 @@ -master \ No newline at end of file +master-7.x \ No newline at end of file ===================================== server-configuration/.mvn/pom.gitflow.develop ===================================== --- a/server-configuration/.mvn/pom.gitflow.develop +++ b/server-configuration/.mvn/pom.gitflow.develop @@ -1 +1 @@ -develop \ No newline at end of file +develop-7.x \ No newline at end of file ===================================== server-configuration/.mvn/pom.gitflow.master ===================================== --- a/server-configuration/.mvn/pom.gitflow.master +++ b/server-configuration/.mvn/pom.gitflow.master @@ -1 +1 @@ -master \ No newline at end of file +master-7.x \ No newline at end of file ===================================== server/.mvn/pom.gitflow.develop ===================================== --- a/server/.mvn/pom.gitflow.develop +++ b/server/.mvn/pom.gitflow.develop @@ -1 +1 @@ -develop \ No newline at end of file +develop-7.x \ No newline at end of file ===================================== server/.mvn/pom.gitflow.master ===================================== --- a/server/.mvn/pom.gitflow.master +++ b/server/.mvn/pom.gitflow.master @@ -1 +1 @@ -master \ No newline at end of file +master-7.x \ No newline at end of file ===================================== services-client/.mvn/pom.gitflow.develop ===================================== --- a/services-client/.mvn/pom.gitflow.develop +++ b/services-client/.mvn/pom.gitflow.develop @@ -1 +1 @@ -develop \ No newline at end of file +develop-7.x \ No newline at end of file ===================================== services-client/.mvn/pom.gitflow.master ===================================== --- a/services-client/.mvn/pom.gitflow.master +++ b/services-client/.mvn/pom.gitflow.master @@ -1 +1 @@ -master \ No newline at end of file +master-7.x \ No newline at end of file ===================================== services-local/.mvn/pom.gitflow.develop ===================================== --- a/services-local/.mvn/pom.gitflow.develop +++ b/services-local/.mvn/pom.gitflow.develop @@ -1 +1 @@ -develop \ No newline at end of file +develop-7.x \ No newline at end of file ===================================== services-local/.mvn/pom.gitflow.master ===================================== --- a/services-local/.mvn/pom.gitflow.master +++ b/services-local/.mvn/pom.gitflow.master @@ -1 +1 @@ -master \ No newline at end of file +master-7.x \ No newline at end of file ===================================== services/.mvn/pom.gitflow.develop ===================================== --- a/services/.mvn/pom.gitflow.develop +++ b/services/.mvn/pom.gitflow.develop @@ -1 +1 @@ -develop \ No newline at end of file +develop-7.x \ No newline at end of file ===================================== services/.mvn/pom.gitflow.master ===================================== --- a/services/.mvn/pom.gitflow.master +++ b/services/.mvn/pom.gitflow.master @@ -1 +1 @@ -master \ No newline at end of file +master-7.x \ No newline at end of file ===================================== test/.mvn/pom.gitflow.develop ===================================== --- a/test/.mvn/pom.gitflow.develop +++ b/test/.mvn/pom.gitflow.develop @@ -1 +1 @@ -develop \ No newline at end of file +develop-7.x \ No newline at end of file ===================================== test/.mvn/pom.gitflow.master ===================================== --- a/test/.mvn/pom.gitflow.master +++ b/test/.mvn/pom.gitflow.master @@ -1 +1 @@ -master \ No newline at end of file +master-7.x \ No newline at end of file ===================================== validation/.mvn/pom.gitflow.develop ===================================== --- a/validation/.mvn/pom.gitflow.develop +++ b/validation/.mvn/pom.gitflow.develop @@ -1 +1 @@ -develop \ No newline at end of file +develop-7.x \ No newline at end of file ===================================== validation/.mvn/pom.gitflow.master ===================================== --- a/validation/.mvn/pom.gitflow.master +++ b/validation/.mvn/pom.gitflow.master @@ -1 +1 @@ -master \ No newline at end of file +master-7.x \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/12b2cebe862344b849965b5432… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/12b2cebe862344b849965b5432… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/7.0-RC-14] 17 commits: update jgitflow configuraiton
by Tony CHEMIT 18 Jun '18

18 Jun '18

Tony CHEMIT pushed to branch release/7.0-RC-14 at ultreiaio / ird-observe Commits: cd9c6480 by Tony CHEMIT at 2018-06-18T06:20:16Z update jgitflow configuraiton - - - - - d87ac584 by Tony CHEMIT at 2018-06-18T06:20:20Z Set maintenance brance (for 7.x) - - - - - f19cd6ae by Tony CHEMIT at 2018-06-18T06:20:20Z [PS] Sur marée PS, les bateaux présentés sont les palangriers - Closes #954 - - - - - 278ec3b2 by Tony CHEMIT at 2018-06-18T06:20:20Z [GEAR] Page des caractéristiques d'équipements -> afficher l'unité attendue - Closes #955 - - - - - 082bcd3b by Tony CHEMIT at 2018-06-18T06:20:20Z [GEAR] Page des caractéristiques d'équipements -> ordonancement des caractéristiques - Closes #956 - - - - - be8c5bd7 by Tony CHEMIT at 2018-06-18T06:20:20Z [REFERENTIEL] Une erreur s'est glissée dans le référentiel SizeMeasureType - Closes #966 - - - - - 6ec84ad6 by Tony CHEMIT at 2018-06-18T06:20:21Z Validation système observé / RHN - Closes #973 - - - - - 69353356 by Tony CHEMIT at 2018-06-18T06:20:21Z -m[REFERENTIEL] L'écran du référentiel taille-poids plante à son ouverture - Closes #964 - - - - - 9403cc67 by Tony CHEMIT at 2018-06-18T06:20:21Z [REFERENTIEL] L'écran du référentiel taille-taille plante - Closes #965 - - - - - 3092f707 by Tony CHEMIT at 2018-06-18T06:20:21Z [REFERENTIEL] Lien entre lengthlengthparameter et species ? - Closes #962 - - - - - e13fd1b5 by Tony CHEMIT at 2018-06-18T06:20:22Z Page des caractéristiques d'équipements -> champs texte tronqués à l'affichage - Closes #957 - - - - - d7d83052 by Tony CHEMIT at 2018-06-18T06:20:22Z Des racourcis clavier interfèrent avec l'autocomplétion des listes déroulantes - Closes #953 - - - - - c0b988cd by Tony CHEMIT at 2018-06-18T06:20:22Z Barre de progression sur calcul de données - Closes #963 - - - - - 235cefdd by Tony CHEMIT at 2018-06-18T06:20:22Z Fix data widget binding - - - - - 239a81c2 by Tony CHEMIT at 2018-06-18T06:20:22Z [PS] Formulaire DCP / matériaux / Couleur de surbrillance - Closes #969 - - - - - 4dce4812 by Tony CHEMIT at 2018-06-18T06:20:22Z L'algo de calcul de données plante sur la base attachée - Closes #972 - Closes #967 - - - - - 29225f10 by Tony CHEMIT at 2018-06-18T06:20:23Z [REFERENTIEL] Lien entre lengthlengthparameter et species ? - See #962 - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client/.mvn/pom.gitflow.develop - client/.mvn/pom.gitflow.master - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/MenuActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java - client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesMeasurementLonglinesTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesMeasurementSeinesTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/GearUseFeaturesSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthLengthParameterUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthLengthParameterUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/common/LengthWeightParameterUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java - dto/.mvn/pom.gitflow.develop The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/0f13168a61eb00e94bcddce5cb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/0f13168a61eb00e94bcddce5cb… 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.0-RC-15-SNAPSHOT development[skip ci]
by Tony CHEMIT 18 Jun '18

18 Jun '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 12b2cebe by Tony CHEMIT at 2018-06-18T06:17:40Z [jgitflow-maven-plugin]updating poms for 7.0-RC-15-SNAPSHOT development[skip ci] - - - - - 13 changed files: - client-configuration/pom.xml - client/pom.xml - dto/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-15-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-15-SNAPSHOT</version> </parent> <artifactId>client</artifactId> ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-15-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-15-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-15-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-15-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== --- a/server-configuration/pom.xml +++ b/server-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-15-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== --- a/server/pom.xml +++ b/server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-15-SNAPSHOT</version> </parent> <artifactId>server</artifactId> ===================================== services-client/pom.xml ===================================== --- a/services-client/pom.xml +++ b/services-client/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-15-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== --- a/services-local/pom.xml +++ b/services-local/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-15-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-15-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-15-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-14-SNAPSHOT</version> + <version>7.0-RC-15-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/12b2cebe862344b849965b54320… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/12b2cebe862344b849965b54320… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.0-RC-14
by Tony CHEMIT 18 Jun '18

18 Jun '18

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

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [REFERENTIEL] Lien entre lengthlengthparameter et species ? - See #962
by Tony CHEMIT 17 Jun '18

17 Jun '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 0f13168a by Tony CHEMIT at 2018-06-17T12:35:30Z [REFERENTIEL] Lien entre lengthlengthparameter et species ? - See #962 - - - - - 3 changed files: - persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterTopiaDao.java - persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterTopiaDao.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterTopiaDao.java +++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterTopiaDao.java @@ -26,10 +26,11 @@ import java.util.Optional; public class LengthLengthParameterTopiaDao extends AbstractLengthLengthParameterTopiaDao<LengthLengthParameter> { - Optional<LengthLengthParameter> find(SizeMeasureType inputSizeMeasureType, SizeMeasureType outputSizeMeasureType) { + Optional<LengthLengthParameter> find(Species species, SizeMeasureType inputSizeMeasureType, SizeMeasureType outputSizeMeasureType) { return Optional.ofNullable( - forProperties(LengthLengthParameter.PROPERTY_INPUT_SIZE_MEASURE_TYPE, inputSizeMeasureType, + forProperties(LengthLengthParameter.PROPERTY_SPECIES, species, + LengthLengthParameter.PROPERTY_INPUT_SIZE_MEASURE_TYPE, inputSizeMeasureType, LengthLengthParameter.PROPERTY_OUTPUT_SIZE_MEASURE_TYPE, outputSizeMeasureType) .tryFindAny() .orNull()); ===================================== persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java +++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java @@ -35,9 +35,10 @@ import java.util.Optional; public class LengthLengthParameters { public static Optional<LengthLengthParameter> findLengthLengthParameter(ObserveTopiaDaoSupplier daoSupplier, + Species species, SizeMeasureType inputSizeMeasureType, SizeMeasureType outputSizeMeasureType) { - return daoSupplier.getLengthLengthParameterDao().find(inputSizeMeasureType, outputSizeMeasureType); + return daoSupplier.getLengthLengthParameterDao().find(species, inputSizeMeasureType, outputSizeMeasureType); } } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== --- a/services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java +++ b/services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java @@ -680,7 +680,7 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements if (outputSizeMeasureType != null && !outputSizeMeasureType.equals(inputSizeMeasureType)) { // on doit effectuer une conversion taille - taille avant de convertir en poids - Optional<LengthLengthParameter> optionalLengthLengthParameter = LengthLengthParameters.findLengthLengthParameter(activityContext.daoSupplier, inputSizeMeasureType, outputSizeMeasureType); + Optional<LengthLengthParameter> optionalLengthLengthParameter = LengthLengthParameters.findLengthLengthParameter(activityContext.daoSupplier, species,inputSizeMeasureType, outputSizeMeasureType); if (optionalLengthLengthParameter.isPresent()) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0f13168a61eb00e94bcddce5cb1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0f13168a61eb00e94bcddce5cb1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] L'algo de calcul de données plante sur la base attachée - Closes #972 - Closes #967
by Tony CHEMIT 17 Jun '18

17 Jun '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 1c7a4248 by Tony CHEMIT at 2018-06-17T12:26:14Z L'algo de calcul de données plante sur la base attachée - Closes #972 - Closes #967 - - - - - 1 changed file: - persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java +++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java @@ -47,12 +47,12 @@ public class LengthLengthParameterImpl extends LengthLengthParameterAbstract imp @Override public Float computeFromFomulaOne(float data) { - return FormulaHelper.computeValue(this, inputOutputFormula, null, FormulaHelper.VARIABLE_INPUT, data); + return FormulaHelper.computeValue(this, inputOutputFormula, null, FormulaHelper.VARIABLE_LENGTH, data); } @Override public Float computeFromFomulaTwo(float data) { - return FormulaHelper.computeValue(this, outputInputFormula, FormulaHelper.COEFFICIENT_B, FormulaHelper.VARIABLE_OUTPUT, data); + return FormulaHelper.computeValue(this, outputInputFormula, FormulaHelper.COEFFICIENT_B, FormulaHelper.VARIABLE_LENGTH, data); } @Override @@ -67,13 +67,13 @@ public class LengthLengthParameterImpl extends LengthLengthParameterAbstract imp @Override public void revalidateFormulaOne() { - boolean result = FormulaHelper.validateRelation(this, inputOutputFormula, FormulaHelper.VARIABLE_INPUT); + boolean result = FormulaHelper.validateRelation(this, inputOutputFormula, FormulaHelper.VARIABLE_LENGTH); setFormulaOneValid(result); } @Override public void revalidateFormulaTwo() { - boolean result = FormulaHelper.validateRelation(this, outputInputFormula, FormulaHelper.VARIABLE_OUTPUT); + boolean result = FormulaHelper.validateRelation(this, outputInputFormula, FormulaHelper.VARIABLE_LENGTH); setFormulaTwoValid(result); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1c7a4248998f367a530e6980c3a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1c7a4248998f367a530e6980c3a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] L'algo de calcul de données plante sur la base attachée - Closes #972
by Tony CHEMIT 17 Jun '18

17 Jun '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 00ec2971 by Tony CHEMIT at 2018-06-17T12:25:18Z L'algo de calcul de données plante sur la base attachée - Closes #972 - - - - - 1 changed file: - persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java +++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java @@ -47,12 +47,12 @@ public class LengthLengthParameterImpl extends LengthLengthParameterAbstract imp @Override public Float computeFromFomulaOne(float data) { - return FormulaHelper.computeValue(this, inputOutputFormula, null, FormulaHelper.VARIABLE_INPUT, data); + return FormulaHelper.computeValue(this, inputOutputFormula, null, FormulaHelper.VARIABLE_LENGTH, data); } @Override public Float computeFromFomulaTwo(float data) { - return FormulaHelper.computeValue(this, outputInputFormula, FormulaHelper.COEFFICIENT_B, FormulaHelper.VARIABLE_OUTPUT, data); + return FormulaHelper.computeValue(this, outputInputFormula, FormulaHelper.COEFFICIENT_B, FormulaHelper.VARIABLE_LENGTH, data); } @Override @@ -67,13 +67,13 @@ public class LengthLengthParameterImpl extends LengthLengthParameterAbstract imp @Override public void revalidateFormulaOne() { - boolean result = FormulaHelper.validateRelation(this, inputOutputFormula, FormulaHelper.VARIABLE_INPUT); + boolean result = FormulaHelper.validateRelation(this, inputOutputFormula, FormulaHelper.VARIABLE_LENGTH); setFormulaOneValid(result); } @Override public void revalidateFormulaTwo() { - boolean result = FormulaHelper.validateRelation(this, outputInputFormula, FormulaHelper.VARIABLE_OUTPUT); + boolean result = FormulaHelper.validateRelation(this, outputInputFormula, FormulaHelper.VARIABLE_LENGTH); setFormulaTwoValid(result); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/00ec2971b9e65429f304656dd70… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/00ec2971b9e65429f304656dd70… You're receiving this email because of your account on gitlab.com.

1 0