GitLab

at 2018-06-18T06:20:16Z

update jgitflow configuraiton

Set maintenance brance (for 7.x)

[PS] Sur marée PS, les bateaux présentés sont les palangriers - Closes #954

[GEAR] Page des caractéristiques d'équipements -> afficher l'unité attendue - Closes #955

[GEAR] Page des caractéristiques d'équipements -> ordonancement des caractéristiques - Closes #956

[REFERENTIEL] Une erreur s'est glissée dans le référentiel SizeMeasureType - Closes #966

Validation système observé / RHN - Closes #973

-m[REFERENTIEL] L'écran du référentiel taille-poids plante à son ouverture - Closes #964

[REFERENTIEL] L'écran du référentiel taille-taille plante - Closes #965

[REFERENTIEL] Lien entre lengthlengthparameter et species ? - Closes #962

Page des caractéristiques d'équipements -> champs texte tronqués à l'affichage - Closes #957

Des racourcis clavier interfèrent avec l'autocomplétion des listes déroulantes - Closes #953

Barre de progression sur calcul de données - Closes #963

Fix data widget binding

[PS] Formulaire DCP / matériaux / Couleur de surbrillance - Closes #969

L'algo de calcul de données plante sur la base attachée - Closes #972 - Closes #967

[REFERENTIEL] Lien entre lengthlengthparameter et species ? - See #962

[jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-14' with non-snapshot versions[skip ci]
fix release

[jgitflow-maven-plugin]merging 'release/7.0-RC-14' into 'master-7.x'
[jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci]
fix release

-develop
+develop-7.x
-master
+master-7.x
-develop
+develop-7.x
-master
+master-7.x
-develop
+develop-7.x
-master
+master-7.x
-develop
+develop-7.x
-master
+master-7.x
 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;

+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;

+    }

+}
 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;

+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;

+    }

+}
-develop
+develop-7.x
-master
+master-7.x
-develop
+develop-7.x
-master
+master-7.x
-develop
+develop-7.x
-master
+master-7.x
-develop
+develop-7.x
-master
+master-7.x
-develop
+develop-7.x
-master
+master-7.x
-develop
+develop-7.x
-master
+master-7.x
-develop
+develop-7.x
-master
+master-7.x
-develop
+develop-7.x
-master
+master-7.x
-develop
+develop-7.x
-master
+master-7.x

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe

Commits:

30 changed files:

Changes:

 -develop
 \ No newline at end of file
 +develop-7.x
 \ No newline at end of file