Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 9cfd1b6f by Tony CHEMIT at 2018-10-14T08:02:22Z [PS] Calée / Captures accessoires : le numéro de cuve n'est plus éditable après le premier enregistrement - Closes #1143 - - - - - 64264463 by Tony CHEMIT at 2018-10-14T08:10:52Z Problème d'affichage dans l'UI référentiel relations taille-poids - Closes #1142 - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUI.jcss - persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityDtoBinder.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUI.jcss ===================================== @@ -46,13 +46,11 @@ #resetWell { toolTipText:"observe.common.DataDto.action.reset.well.tip"; - enabled:{!tableModel.isEditable() || !model.isRowSaved()}; _resetTablePropertyName:{NonTargetCatchDto.PROPERTY_WELL}; } #well { text:{getStringValue(tableEditBean.getWell())}; - enabled:{!tableModel.isEditable() || !model.isRowSaved()}; _tablePropertyName:{NonTargetCatchDto.PROPERTY_WELL}; } ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityDtoBinder.java ===================================== @@ -52,6 +52,9 @@ public class LengthWeightParameterEntityDtoBinder extends ReferentialEntityDtoBi entity.setStartDate(dto.getStartDate()); entity.setEndDate(dto.getEndDate()); entity.setSizeMeasureType(toEntity(dto.getSizeMeasureType())); + entity.setMeanLength(dto.getMeanLength()); + entity.setMeanWeight(dto.getMeanWeight()); + } @@ -69,7 +72,8 @@ public class LengthWeightParameterEntityDtoBinder extends ReferentialEntityDtoBi dto.setStartDate(entity.getStartDate()); dto.setEndDate(entity.getEndDate()); dto.setSizeMeasureType(toReferentialReference(referentialLocale, entity.getSizeMeasureType())); - + dto.setMeanLength(entity.getMeanLength()); + dto.setMeanWeight(entity.getMeanWeight()); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3ef955bbf7ce2d675551cbccd22... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3ef955bbf7ce2d675551cbccd22... You're receiving this email because of your account on gitlab.com.