Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

6 changed files:

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
    352 352
    353 353 
         private void updateView(boolean editing) {
    354 354 
             log.debug("Editing has changed : " + editing);
    355 
    -        JButton deleteAction = ui.getDelete();
    356 
    -        if (editing) {
    357 
    -            ui.getDetailRealActions().add(deleteAction);
    358 
    -        } else {
    359 
    -            ui.getListActions().add(deleteAction);
    355 
    +        if (!getModel().isReadingMode()) {
    356 
    +            JButton deleteAction = ui.getDelete();
    357 
    +            if (editing) {
    358 
    +                ui.getDetailRealActions().add(deleteAction);
    359 
    +            } else {
    360 
    +                ui.getListActions().add(deleteAction);
    361 
    +            }
    360 362 
             }
    361 363 
             ui.getViewLayout().setSelected(editing ? ContentReferenceUI.DETAIL_VIEW : ContentReferenceUI.LIST_VIEW);
    362 364 
         }

  • 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;
    40 40 
     import fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOwnershipHelper;
    41 41 
     import fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOwnershipReference;
    42 42 
     import fr.ird.observe.dto.referential.ps.observation.ObjectMaterialDto;
    43 
    -import fr.ird.observe.dto.referential.ps.observation.ObjectMaterialTypeReference;
    44 43 
     import fr.ird.observe.dto.referential.ps.observation.ObjectOperationReference;
    45 44 
     import org.apache.logging.log4j.LogManager;
    46 45 
     import org.apache.logging.log4j.Logger;
    ... ... @@ -84,14 +83,6 @@ public class FloatingObjectUIHandler extends ContentEditUIHandler<FloatingObject
    84 83
    85 84 
             ObjectMaterialHierarchyDto detailedForm = getFloatingObjectService().getObjectMaterialHierarchy();
    86 85
    87 
    -        //FIXME-PROTECTED-ID
    88 
    -        ObjectMaterialTypeReference booleanType = getReferentialReferences(ObjectMaterialTypeReference.class).stream().filter(e -> e.getTopiaId().equals("fr.ird.referential.ps.observation.ObjectMaterialType#0#0")).findFirst().orElseThrow(IllegalStateException::new);
    89 
    -
    90 
    -        for (ObjectMaterialHierarchyDto objectMaterialHierarchyDto : detailedForm.getChildren()) {
    91 
    -            if (objectMaterialHierarchyDto.isEnabled()) {
    92 
    -                objectMaterialHierarchyDto.setObjectMaterialType(booleanType);
    93 
    -            }
    94 
    -        }
    95 86 
             Map<String, ObjectMaterialDto> allMap = new TreeMap<>();
    96 87 
             detailedForm.getAllDtos().forEach(s -> allMap.putIfAbsent(s.getId(), s));
    97 88

  • 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;
    28 28 
     import fr.ird.observe.dto.referential.ps.observation.ObjectMaterialReference;
    29 29 
     import org.nuiton.jaxx.runtime.spi.UIHandler;
    30 30
    31 
    -import java.util.Collections;
    32 31 
     import java.util.List;
    33 32 
     import java.util.Objects;
    34 33 
     import java.util.Optional;
    ... ... @@ -46,23 +45,23 @@ class ObjectMaterialUIHandler extends ContentReferenceUIHandler<ObjectMaterialDt
    46 45 
         @Override
    47 46 
         public void createUI() {
    48 47 
             super.createUI();
    49 
    -        Optional<Set<ObjectMaterialReference>> optionalReferenceSetDto = getModel().getReferenceCache().tryToGetReferentialReferenceSet(ObjectMaterialDto.PROPERTY_PARENT);
    50 
    -
    51 
    -        if (optionalReferenceSetDto.isPresent()) {
    52 
    -            ObjectMaterialReference parent = getModel().getBean().getParent();
    53 
    -            List<ObjectMaterialReference> references = optionalReferenceSetDto.get().stream().filter(r -> !Objects.equals(r.getId(), Optional.ofNullable(parent).map(ReferentialDtoReference::getId).orElse(null))).collect(Collectors.toList());
    54 
    -            ui.getParentCode().setData(references);
    55 
    -        }
    48 
    +        setParentList();
    56 49 
         }
    57 50
    58 51 
         @Override
    59 52 
         public void modifyUI() {
    60 53 
             super.modifyUI();
    61 
    -        ObjectMaterialReference parent = getModel().getBean().getParent();
    62 
    -        if (parent == null) {
    63 
    -            ui.getParentCode().setData(Collections.emptyList());
    64 
    -        } else {
    65 
    -            ui.getParentCode().setData(Collections.singletonList(parent));
    54 
    +        setParentList();
    55 
    +    }
    56 
    +
    57 
    +    private void setParentList() {
    58 
    +        Optional<Set<ObjectMaterialReference>> optionalReferenceSetDto = getModel().getReferenceCache().tryToGetReferentialReferenceSet(ObjectMaterialDto.PROPERTY_PARENT);
    59 
    +
    60 
    +        if (optionalReferenceSetDto.isPresent()) {
    61 
    +
    62 
    +            ObjectMaterialReference parent = getModel().getBean().getParent();
    63 
    +            List<ObjectMaterialReference> references = optionalReferenceSetDto.get().stream().filter(r -> !Objects.equals(r.getId(), Optional.ofNullable(parent).map(ReferentialDtoReference::getId).orElse(null))).collect(Collectors.toList());
    64 
    +            getUi().getParentCode().setData(references);
    66 65 
             }
    67 66 
         }
    68 67

  • dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java
    ... ... @@ -112,6 +112,8 @@ public class ObserveI18nLabelsBuilder extends BeanPropertyI18nKeyProducerSupport
    112 112 
         protected Map<String, String> createPropertyKeyMapping() {
    113 113 
             return ImmutableMap.<String, String>builder()
    114 114 
                     .put("sizeMeasureTypeCode", "sizeMeasureType")
    115 
    +                .put("inputSizeMeasureTypeCode", "inputSizeMeasureType")
    116 
    +                .put("outputSizeMeasureTypeCode", "outputSizeMeasureType")
    115 117 
                     .build();
    116 118 
         }
    117 119

  • 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;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import fr.ird.observe.dto.referential.FormulaHelper;
    25 26 
     import org.apache.commons.lang3.StringUtils;
    26 27
    27 28 
     public class ObjectMaterialDto extends GeneratedObjectMaterialDto {
    ... ... @@ -44,6 +45,13 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto {
    44 45 
             return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#1".equals(objectMaterialType.getId());
    45 46 
         }
    46 47
    48 
    +    @Override
    49 
    +    public void setValidation(String validation) {
    50 
    +        super.setValidation(validation);
    51 
    +        boolean result = FormulaHelper.validateObjectMaterialValidation(validation, 10);
    52 
    +        setValidationValid(result);
    53 
    +    }
    54 
    +
    47 55 
         public boolean withValidation() {
    48 56 
             return StringUtils.isNoneEmpty(validation);
    49 57 
         }

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>io.ultreia.maven</groupId>
    28 28 
         <artifactId>pom</artifactId>
    29 
    -    <version>2019.8.21</version>
    29 
    +    <version>2019.8.22</version>
    30 30 
       </parent>
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>
    ... ... @@ -161,7 +161,7 @@
    161 161 
         <!--can't use 1.4.197 (date has changed + blob also)-->
    162 162 
         <lib.version.h2>1.4.196</lib.version.h2>
    163 163
    164 
    -    <lib.version.java4all.topia>1.10-SNAPSHOT</lib.version.java4all.topia>
    164 
    +    <!--<lib.version.java4all.topia>1.10-SNAPSHOT</lib.version.java4all.topia>-->
    165 165 
         <!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>-->
    166 166 
         <!--lib.version.java4all.jaxx>3.0-alpha-52</lib.version.java4all.jaxx-->
    167 167 
         <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>-->

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.