Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: e02c7f10 by tchemit at 2019-06-27T04:37:30Z [REFERENTIEL] Impossible de modifier le parent d'un matériau - Closes #1338 - - - - - 1c58659b by tchemit at 2019-06-27T04:43:40Z [REFERENTIEL] La validation sur les Objets flottant matériaux ne fonctionnent plus :( - Closes #1339 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUIHandler.java - dto/src/main/java/fr/ird/observe/dto/referential/seine/ObjectMaterialDto.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUIHandler.java ===================================== @@ -28,7 +28,6 @@ import fr.ird.observe.dto.referential.seine.ObjectMaterialDto; import fr.ird.observe.dto.referential.seine.ObjectMaterialReference; import org.nuiton.jaxx.runtime.spi.UIHandler; -import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -46,6 +45,16 @@ class ObjectMaterialUIHandler extends ContentReferenceUIHandler<ObjectMaterialDt @Override public void createUI() { super.createUI(); + setParentList(); + } + + @Override + public void modifyUI() { + super.modifyUI(); + setParentList(); + } + + private void setParentList() { Optional<Set<ObjectMaterialReference>> optionalReferenceSetDto = getModel().tryToGetReferentialReferenceSet(ObjectMaterialDto.PROPERTY_PARENT); if (optionalReferenceSetDto.isPresent()) { @@ -56,16 +65,4 @@ class ObjectMaterialUIHandler extends ContentReferenceUIHandler<ObjectMaterialDt } } - @Override - public void modifyUI() { - super.modifyUI(); - ObjectMaterialReference parent = getBean().getParent(); - if (parent == null) { - - getUi().getParentCode().setData(Collections.emptyList()); - } else { - getUi().getParentCode().setData(Collections.singletonList(parent)); - } - } - } ===================================== dto/src/main/java/fr/ird/observe/dto/referential/seine/ObjectMaterialDto.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.dto.referential.seine; * #L% */ +import fr.ird.observe.dto.referential.FormulaHelper; import org.apache.commons.lang3.StringUtils; public class ObjectMaterialDto extends GeneratedObjectMaterialDto { @@ -44,6 +45,13 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto { return objectMaterialType != null && "fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#1".equals(objectMaterialType.getId()); } + @Override + public void setValidation(String validation) { + super.setValidation(validation); + boolean result = FormulaHelper.validateObjectMaterialValidation(validation, 10); + setValidationValid(result); + } + public boolean withValidation() { return StringUtils.isNoneEmpty(validation); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3cf7c59b335e6d1bcfaa0cf3e94... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3cf7c59b335e6d1bcfaa0cf3e94... You're receiving this email because of your account on gitlab.com.