Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 19e30588 by tchemit at 2019-06-27T05:28:05Z update pom - - - - - f64a33aa by tchemit at 2019-06-27T05:30:37Z Clés de référentiel non traduite ou nom des clés invalide - Close #1336 - - - - - 5f644483 by tchemit at 2019-06-27T05:33:03Z [REFERENTIEL] Impossible de modifier le parent d'un matériau - Closes #1338 - - - - - 230a5851 by tchemit at 2019-06-27T05:34:46Z [REFERENTIEL] La validation sur les Objets flottant matériaux ne fonctionnent plus :( - Closes #1339 - - - - - 7cd87441 by tchemit at 2019-06-27T05:37:57Z [PS][FAD] Comportement des entrées 'FAD' et 'LOG' - Closes #1324 - - - - - 3bd3958b by tchemit at 2019-06-27T05:39:11Z Fix referential back to list action - - - - - 6 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/observation/ObjectMaterialUIHandler.java - dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java - dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java - pom.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIHandler.java ===================================== @@ -352,11 +352,13 @@ public class ContentReferenceUIHandler<D extends ReferentialDto, R extends Refer private void updateView(boolean editing) { log.debug("Editing has changed : " + editing); - JButton deleteAction = ui.getDelete(); - if (editing) { - ui.getDetailRealActions().add(deleteAction); - } else { - ui.getListActions().add(deleteAction); + if (!getModel().isReadingMode()) { + JButton deleteAction = ui.getDelete(); + if (editing) { + ui.getDetailRealActions().add(deleteAction); + } else { + ui.getListActions().add(deleteAction); + } } ui.getViewLayout().setSelected(editing ? ContentReferenceUI.DETAIL_VIEW : ContentReferenceUI.LIST_VIEW); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/FloatingObjectUIHandler.java ===================================== @@ -40,7 +40,6 @@ import fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOwnershipDto; import fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOwnershipHelper; import fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOwnershipReference; import fr.ird.observe.dto.referential.ps.observation.ObjectMaterialDto; -import fr.ird.observe.dto.referential.ps.observation.ObjectMaterialTypeReference; import fr.ird.observe.dto.referential.ps.observation.ObjectOperationReference; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -84,14 +83,6 @@ public class FloatingObjectUIHandler extends ContentEditUIHandler<FloatingObject ObjectMaterialHierarchyDto detailedForm = getFloatingObjectService().getObjectMaterialHierarchy(); - //FIXME-PROTECTED-ID - ObjectMaterialTypeReference booleanType = getReferentialReferences(ObjectMaterialTypeReference.class).stream().filter(e -> e.getTopiaId().equals("fr.ird.referential.ps.observation.ObjectMaterialType#0#0")).findFirst().orElseThrow(IllegalStateException::new); - - for (ObjectMaterialHierarchyDto objectMaterialHierarchyDto : detailedForm.getChildren()) { - if (objectMaterialHierarchyDto.isEnabled()) { - objectMaterialHierarchyDto.setObjectMaterialType(booleanType); - } - } Map<String, ObjectMaterialDto> allMap = new TreeMap<>(); detailedForm.getAllDtos().forEach(s -> allMap.putIfAbsent(s.getId(), s)); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/observation/ObjectMaterialUIHandler.java ===================================== @@ -28,7 +28,6 @@ import fr.ird.observe.dto.referential.ps.observation.ObjectMaterialDto; import fr.ird.observe.dto.referential.ps.observation.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,23 +45,23 @@ class ObjectMaterialUIHandler extends ContentReferenceUIHandler<ObjectMaterialDt @Override public void createUI() { super.createUI(); - Optional<Set<ObjectMaterialReference>> optionalReferenceSetDto = getModel().getReferenceCache().tryToGetReferentialReferenceSet(ObjectMaterialDto.PROPERTY_PARENT); - - if (optionalReferenceSetDto.isPresent()) { - ObjectMaterialReference parent = getModel().getBean().getParent(); - List<ObjectMaterialReference> references = optionalReferenceSetDto.get().stream().filter(r -> !Objects.equals(r.getId(), Optional.ofNullable(parent).map(ReferentialDtoReference::getId).orElse(null))).collect(Collectors.toList()); - ui.getParentCode().setData(references); - } + setParentList(); } @Override public void modifyUI() { super.modifyUI(); - ObjectMaterialReference parent = getModel().getBean().getParent(); - if (parent == null) { - ui.getParentCode().setData(Collections.emptyList()); - } else { - ui.getParentCode().setData(Collections.singletonList(parent)); + setParentList(); + } + + private void setParentList() { + Optional<Set<ObjectMaterialReference>> optionalReferenceSetDto = getModel().getReferenceCache().tryToGetReferentialReferenceSet(ObjectMaterialDto.PROPERTY_PARENT); + + if (optionalReferenceSetDto.isPresent()) { + + ObjectMaterialReference parent = getModel().getBean().getParent(); + List<ObjectMaterialReference> references = optionalReferenceSetDto.get().stream().filter(r -> !Objects.equals(r.getId(), Optional.ofNullable(parent).map(ReferentialDtoReference::getId).orElse(null))).collect(Collectors.toList()); + getUi().getParentCode().setData(references); } } ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java ===================================== @@ -112,6 +112,8 @@ public class ObserveI18nLabelsBuilder extends BeanPropertyI18nKeyProducerSupport protected Map<String, String> createPropertyKeyMapping() { return ImmutableMap.<String, String>builder() .put("sizeMeasureTypeCode", "sizeMeasureType") + .put("inputSizeMeasureTypeCode", "inputSizeMeasureType") + .put("outputSizeMeasureTypeCode", "outputSizeMeasureType") .build(); } ===================================== dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.dto.referential.ps.observation; * #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.referential.ps.observation.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); } ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.21</version> + <version>2019.8.22</version> </parent> <groupId>fr.ird.observe</groupId> @@ -161,7 +161,7 @@ <!--can't use 1.4.197 (date has changed + blob also)--> <lib.version.h2>1.4.196</lib.version.h2> - <lib.version.java4all.topia>1.10-SNAPSHOT</lib.version.java4all.topia> + <!--<lib.version.java4all.topia>1.10-SNAPSHOT</lib.version.java4all.topia>--> <!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>--> <!--lib.version.java4all.jaxx>3.0-alpha-52</lib.version.java4all.jaxx--> <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>--> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ddd980c3a8327020b38c59b9e82... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ddd980c3a8327020b38c59b9e82... You're receiving this email because of your account on gitlab.com.