Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cbccc232 by Tony Chemit at 2023-02-13T16:35:10+01:00 Champ manquant sur un formulaire échantillons - Closes #2625 - - - - - c8c7907d by Tony Chemit at 2023-02-13T16:35:15+01:00 Dto autoTrim - review some missing autoTrim (mainly on comment) - - - - - 8 changed files: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jcss - toolkit/api/src/main/java/fr/ird/observe/dto/BusinessDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/IdDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/ContainerDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/EditableDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/SimpleDto.java - toolkit/api/src/main/java/fr/ird/observe/dto/data/WithSimpleComment.java Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx ===================================== @@ -117,6 +117,14 @@ </JPanel> </cell> </row> + <row> + <cell> + <JLabel id='sizeMeasureMethodLabel'/> + </cell> + <cell weightx='0.5' anchor='east'> + <FilterableComboBox id='sizeMeasureMethod' genericType='SizeMeasureMethodReference'/> + </cell> + </row> <row> <cell> <JLabel id='weightMeasureMethodLabel'/> @@ -125,6 +133,7 @@ <FilterableComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/> </cell> </row> + <row> <cell> <JLabel id='sexLabel'/> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jcss ===================================== @@ -27,6 +27,10 @@ disabledIcon:{getStates().getSourceInformationIcon(tableEditBean.isIsLengthComputed())}; } +#sizeMeasureMethod { + enabled: {tableEditBean.getLength() != null && !tableEditBean.isIsLengthComputed()}; +} + #weightSourceInformation { enabled: {tableEditBean.getAcquisitionMode() == 1 && tableEditBean.isIsWeightComputed()}; toolTipText:{getStates().getWeightDataTip(tableEditBean.isIsWeightComputed())}; ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/BusinessDto.java ===================================== @@ -34,9 +34,7 @@ import java.util.Collection; import java.util.Date; import java.util.Objects; import java.util.Optional; -import java.util.function.Consumer; import java.util.function.Predicate; -import java.util.function.Supplier; /** * Created on 21/07/2021. ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/IdDto.java ===================================== @@ -128,7 +128,7 @@ public abstract class IdDto extends AbstractJavaBean implements ObserveDto, DtoR public void autoTrim() { } - protected void autoTrim(Supplier<String> getter, Consumer<String> setter) { + public static void autoTrim(Supplier<String> getter, Consumer<String> setter) { String stringValue = getter.get(); if (stringValue != null) { String stringTrimmedValue = stringValue.trim(); ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/ContainerDto.java ===================================== @@ -81,4 +81,9 @@ public abstract class ContainerDto<C extends ContainerChildDto> extends DataDto firePropertyChange(PROPERTY_CHILDREN, oldValue, children); } + @Override + public void autoTrim() { + super.autoTrim(); + WithSimpleComment.super.autoTrim(); + } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/EditableDto.java ===================================== @@ -55,6 +55,6 @@ public abstract class EditableDto extends DataDto implements WithSimpleComment { @Override public void autoTrim() { super.autoTrim(); - autoTrim(this::getComment, this::setComment); + WithSimpleComment.super.autoTrim(); } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/SimpleDto.java ===================================== @@ -46,4 +46,9 @@ public abstract class SimpleDto extends DataDto implements WithSimpleComment { firePropertyChange(PROPERTY_COMMENT, oldValue, comment); } + @Override + public void autoTrim() { + super.autoTrim(); + WithSimpleComment.super.autoTrim(); + } } ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/data/WithSimpleComment.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.dto.data; * #L% */ +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.ObserveDto; import io.ultreia.java4all.bean.JavaBean; @@ -37,4 +38,8 @@ public interface WithSimpleComment extends JavaBean, ObserveDto { void setComment(String comment); + default void autoTrim() { + IdDto.autoTrim(this::getComment, this::setComment); + } + } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6ad2de7ec5f6e247653b8d451... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6ad2de7ec5f6e247653b8d451... You're receiving this email because of your account on gitlab.com.