Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
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:
| ... | ... | @@ -46,13 +46,11 @@ |
| 46 | 46 |
|
| 47 | 47 |
#resetWell {
|
| 48 | 48 |
toolTipText:"observe.common.DataDto.action.reset.well.tip";
|
| 49 |
- enabled:{!tableModel.isEditable() || !model.isRowSaved()};
|
|
| 50 | 49 |
_resetTablePropertyName:{NonTargetCatchDto.PROPERTY_WELL};
|
| 51 | 50 |
}
|
| 52 | 51 |
|
| 53 | 52 |
#well {
|
| 54 | 53 |
text:{getStringValue(tableEditBean.getWell())};
|
| 55 |
- enabled:{!tableModel.isEditable() || !model.isRowSaved()};
|
|
| 56 | 54 |
_tablePropertyName:{NonTargetCatchDto.PROPERTY_WELL};
|
| 57 | 55 |
}
|
| 58 | 56 |
|
| ... | ... | @@ -52,6 +52,9 @@ public class LengthWeightParameterEntityDtoBinder extends ReferentialEntityDtoBi |
| 52 | 52 |
entity.setStartDate(dto.getStartDate());
|
| 53 | 53 |
entity.setEndDate(dto.getEndDate());
|
| 54 | 54 |
entity.setSizeMeasureType(toEntity(dto.getSizeMeasureType()));
|
| 55 |
+ entity.setMeanLength(dto.getMeanLength());
|
|
| 56 |
+ entity.setMeanWeight(dto.getMeanWeight());
|
|
| 57 |
+ |
|
| 55 | 58 |
|
| 56 | 59 |
}
|
| 57 | 60 |
|
| ... | ... | @@ -69,7 +72,8 @@ public class LengthWeightParameterEntityDtoBinder extends ReferentialEntityDtoBi |
| 69 | 72 |
dto.setStartDate(entity.getStartDate());
|
| 70 | 73 |
dto.setEndDate(entity.getEndDate());
|
| 71 | 74 |
dto.setSizeMeasureType(toReferentialReference(referentialLocale, entity.getSizeMeasureType()));
|
| 72 |
- |
|
| 75 |
+ dto.setMeanLength(entity.getMeanLength());
|
|
| 76 |
+ dto.setMeanWeight(entity.getMeanWeight());
|
|
| 73 | 77 |
}
|
| 74 | 78 |
|
| 75 | 79 |
}
|