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

Commits:

2 changed files:

Changes:

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/logbook/ActivityLonglineLogbookNavigationTreeNode.java
    ... ... @@ -111,6 +111,10 @@ public class ActivityLonglineLogbookNavigationTreeNode extends ReferenceNavigati
    111 111
    112 112 
         @Override
    113 113 
         public int getNewPosition(DtoReference<?, ?> beanReference) {
    114 
    +        if (beanReference.isNotPersisted()) {
    115 
    +            // not persisted, always at bottom
    116 
    +            return getChildCount();
    117 
    +        }
    114 118 
             if (beanReference instanceof SetReference) {
    115 119 
                 return 0;
    116 120 
             }

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ll/obs/ActivityLonglineObsNavigationTreeNode.java
    ... ... @@ -29,6 +29,7 @@ import fr.ird.observe.dto.data.ll.observation.ActivityDto;
    29 29 
     import fr.ird.observe.dto.data.ll.observation.ActivityReference;
    30 30 
     import fr.ird.observe.dto.data.ll.observation.SetDto;
    31 31 
     import fr.ird.observe.dto.data.ll.observation.SetReference;
    32 
    +import fr.ird.observe.dto.reference.DtoReference;
    32 33 
     import fr.ird.observe.navigation.model.edit.longline.node.ObserveLonglineObsActivityEditNode;
    33 34 
     import fr.ird.observe.navigation.model.select.longline.node.ObserveLonglineObsActivitySelectNode;
    34 35 
     import fr.ird.observe.navigation.tree.SingleReferenceContainerNode;
    ... ... @@ -102,4 +103,17 @@ public class ActivityLonglineObsNavigationTreeNode extends ReferenceNavigationTr
    102 103 
         public SetLonglineObsNavigationTreeNode newSingleChildNode(String parentId) {
    103 104 
             return newSingleChildNode(new SetReference(getClientUIContext().getDecoratorService().getReferentialLocale()));
    104 105 
         }
    106 
    +
    107 
    +
    108 
    +    @Override
    109 
    +    public int getNewPosition(DtoReference<?, ?> beanReference) {
    110 
    +        if (beanReference.isNotPersisted()) {
    111 
    +            // not persisted, always at bottom
    112 
    +            return getChildCount();
    113 
    +        }
    114 
    +        if (beanReference instanceof SetReference) {
    115 
    +            return 0;
    116 
    +        }
    117 
    +        return super.getNewPosition(beanReference);
    118 
    +    }
    105 119 
     }

    • —
    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.