Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: daeeb76a by Tony Chemit at 2020-06-29T08:27:27+02:00 L'ajout d'une caractéristique d'équipement plante - Closes #1516 - - - - - 3b495783 by Tony Chemit at 2020-06-29T08:30:09+02:00 LL Observations / Echec d'enregistrement d'une capture - Closes #1519 - - - - - 4 changed files: - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SizeMeasureTableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/WeightMeasureTableModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesUIHandler.java Changes: ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesUIHandler.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUI import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUILayoutFocusTraversalPolicy; import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableModelSupport; import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ll.common.GearUseFeaturesDto; import fr.ird.observe.dto.data.ll.common.GearUseFeaturesMeasurementDto; import fr.ird.observe.dto.data.ll.common.TripGearUseFeaturesDto; @@ -55,6 +56,7 @@ import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -319,7 +321,7 @@ public class GearUseFeaturesUIHandler extends ContentTableUIHandler<TripGearUseF return gearDto.getGearCaracteristic().stream() .map(input -> { - GearUseFeaturesMeasurementDto measurementLonglineDto = new GearUseFeaturesMeasurementDto(); + GearUseFeaturesMeasurementDto measurementLonglineDto = IdDto.newDto(GearUseFeaturesMeasurementDto.class, new Date()); measurementLonglineDto.setGearCaracteristic(input); if (input.getGearCaracteristicType().isBoolean()) { measurementLonglineDto.setMeasurementValue(Boolean.FALSE.toString()); ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SizeMeasureTableModel.java ===================================== @@ -23,9 +23,12 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation; */ import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableWithCacheTableModelSupport; +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ll.observation.SizeMeasureDto; import fr.ird.observe.dto.referential.common.SizeMeasureTypeReference; +import java.util.Date; + /** * Created on 12/3/14. * @@ -48,6 +51,7 @@ public class SizeMeasureTableModel extends EditableTableWithCacheTableModelSuppo @Override protected boolean isRowValid(SizeMeasureDto valid) { Float size = valid.getSize(); + //FIXME This is a hardcoded validation ? return !(valid.getSizeMeasureType() == null || size == null) && size > 0 && size < 1000; } @@ -97,7 +101,7 @@ public class SizeMeasureTableModel extends EditableTableWithCacheTableModelSuppo @Override protected SizeMeasureDto createNewRow() { - return new SizeMeasureDto(); + return IdDto.newDto(SizeMeasureDto.class, new Date()); } } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/WeightMeasureTableModel.java ===================================== @@ -23,9 +23,12 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation; */ import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableWithCacheTableModelSupport; +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ll.observation.WeightMeasureDto; import fr.ird.observe.dto.referential.common.WeightMeasureTypeReference; +import java.util.Date; + /** * Created on 12/3/14. * @@ -48,12 +51,13 @@ public class WeightMeasureTableModel extends EditableTableWithCacheTableModelSup @Override public boolean isRowValid(WeightMeasureDto valid) { Float weight = valid.getWeight(); + //FIXME This is a hardcoded validation ? return !(valid.getWeightMeasureType() == null || weight == null) && weight > 0 && weight < 1000; } @Override protected WeightMeasureDto createNewRow() { - return new WeightMeasureDto(); + return IdDto.newDto(WeightMeasureDto.class, new Date()); } @Override ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesUIHandler.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUI import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUILayoutFocusTraversalPolicy; import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableModelSupport; import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ps.common.GearUseFeaturesDto; import fr.ird.observe.dto.data.ps.common.GearUseFeaturesMeasurementDto; import fr.ird.observe.dto.data.ps.common.TripGearUseFeaturesDto; @@ -55,6 +56,7 @@ import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -152,7 +154,7 @@ public class GearUseFeaturesUIHandler extends ContentTableUIHandler<TripGearUseF return gearDto.getGearCaracteristic().stream() .map(input -> { - GearUseFeaturesMeasurementDto measurementSeineDto = new GearUseFeaturesMeasurementDto(); + GearUseFeaturesMeasurementDto measurementSeineDto = IdDto.newDto(GearUseFeaturesMeasurementDto.class, new Date()); if (input.getGearCaracteristicType().isBoolean()) { measurementSeineDto.setMeasurementValue(Boolean.FALSE.toString()); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7e94d30f6384c72165b201cf3... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7e94d30f6384c72165b201cf3... You're receiving this email because of your account on gitlab.com.