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@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@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/12b2cebe862344b849965b54320... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/12b2cebe862344b849965b54320... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT