branch develop updated (a717143 -> c1f6c23)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from a717143 Intégrer ce observe-reports.properties (Fixes #8403) new c1f6c23 [UI] Mauvais fonctionnement dans les caractéristiques d'équipements (Fixes #8316) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c1f6c2347f5f137b303080cf2479abd6c5cae60d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 5 17:13:07 2016 +0200 [UI] Mauvais fonctionnement dans les caractéristiques d'équipements (Fixes #8316) Summary of changes: .../GearUseFeaturesMeasurementLonglinesTableModel.java | 10 +++++++--- .../impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java | 8 +++++++- .../services/dto/referential/GearCaracteristicTypeDtos.java | 8 ++++---- 3 files changed, 18 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c1f6c2347f5f137b303080cf2479abd6c5cae60d Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 5 17:13:07 2016 +0200 [UI] Mauvais fonctionnement dans les caractéristiques d'équipements (Fixes #8316) --- .../GearUseFeaturesMeasurementLonglinesTableModel.java | 10 +++++++--- .../impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java | 8 +++++++- .../services/dto/referential/GearCaracteristicTypeDtos.java | 8 ++++---- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java index 343923d..49561c6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java @@ -22,10 +22,11 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; * #L% */ +import fr.ird.observe.application.swing.ui.util.table.EditableTableWithCacheTableModelSupport; import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDtos; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.application.swing.ui.util.table.EditableTableWithCacheTableModelSupport; /** * Created on 4/7/15. @@ -100,9 +101,12 @@ public class GearUseFeaturesMeasurementLonglinesTableModel extends EditableTable GearUseFeaturesMeasurementLonglineDto measure = data.get(rowIndex); switch (columnIndex) { case 0: - measure.setGearCaracteristic((ReferentialReference<GearCaracteristicDto>) aValue); - + String gearCaracteristicTypeId = (String) measure.getGearCaracteristic().getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); + if (GearCaracteristicTypeDtos.isBoolean(gearCaracteristicTypeId)) { + // on force à avoir false par défaut + measure.setMeasurementValue("false"); + } break; case 1: diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java index ecda673..fb231e7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java @@ -22,10 +22,11 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine; * #L% */ +import fr.ird.observe.application.swing.ui.util.table.EditableTableWithCacheTableModelSupport; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDtos; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; -import fr.ird.observe.application.swing.ui.util.table.EditableTableWithCacheTableModelSupport; /** * Created on 4/7/15. @@ -101,6 +102,11 @@ public class GearUseFeaturesMeasurementSeinesTableModel extends EditableTableWit switch (columnIndex) { case 0: measure.setGearCaracteristic((ReferentialReference<GearCaracteristicDto>) aValue); + String gearCaracteristicTypeId = (String) measure.getGearCaracteristic().getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); + if (GearCaracteristicTypeDtos.isBoolean(gearCaracteristicTypeId)) { + // on force à avoir false par défaut + measure.setMeasurementValue("false"); + } break; case 1: diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDtos.java b/services-model/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDtos.java index c7380fe..a6ac0ce 100644 --- a/services-model/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDtos.java +++ b/services-model/src/main/java/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDtos.java @@ -28,17 +28,17 @@ import java.util.Set; public class GearCaracteristicTypeDtos extends AbstractGearCaracteristicTypeDtos { - public static final Set<String> INTEGER_IDS = Sets.newHashSet( + private static final Set<String> INTEGER_IDS = Sets.newHashSet( "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.3", "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5" ); - public static final Set<String> FLOAT_IDS = Sets.newHashSet( + private static final Set<String> FLOAT_IDS = Sets.newHashSet( "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.4", "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.6" ); - public static final Set<String> BOOLEAN_IDS = Sets.newHashSet( + private static final Set<String> BOOLEAN_IDS = Sets.newHashSet( "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.2" ); @@ -70,7 +70,7 @@ public class GearCaracteristicTypeDtos extends AbstractGearCaracteristicTypeDtos public static Object getTypeValue(String gearCaracteristicTypeId, Object value) { - if (value != null) { + if (value != null && !value.toString().isEmpty()) { if (isBoolean(gearCaracteristicTypeId)) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm