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

Commits:

7 changed files:

Changes:

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeExecutor.java
    ... ... @@ -33,6 +33,7 @@ import fr.ird.observe.navigation.id.IdNode;
    33 33 
     import org.apache.logging.log4j.LogManager;
    34 34 
     import org.apache.logging.log4j.Logger;
    35 35
    36 
    +import javax.swing.SwingUtilities;
    36 37 
     import java.util.Objects;
    37 38
    38 39 
     /**
    ... ... @@ -115,6 +116,7 @@ public class ChangeModeExecutor<U extends ContentUI> {
    115 116 
             selectedNode.reloadNodeData();
    116 117 
             selectedNode.nodeChangedDeep();
    117 118 
             afterOpenReselectNode(ui, dataSourceEditor, tree, selectedNode, id);
    119 
    +        SwingUtilities.invokeLater(tree::invalidateCellSizeCache);
    118 120 
         }
    119 121
    120 122 
         protected void afterOpenReselectNode(U ui, DataSourceEditor dataSourceEditor, NavigationTree tree, NavigationNode selectedNode, String id) {

  • core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetImpl.java
    ... ... @@ -64,4 +64,12 @@ public class SetImpl extends SetAbstract {
    64 64 
         public boolean isUnknownSchoolType() {
    65 65 
             return schoolType != null && ProtectedIdsPs.PS_COMMON_SCHOOL_TYPE_UNDEFINED_ID.equals(schoolType.getTopiaId());
    66 66 
         }
    67 
    +
    68 
    +    @Override
    69 
    +    public int getSampleMeasureSize() {
    70 
    +        if (isSampleEmpty()) {
    71 
    +            return 0;
    72 
    +        }
    73 
    +        return getSample().iterator().next().getSampleMeasureSize();
    74 
    +    }
    67 75 
     }

  • core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetSpi.java
    ... ... @@ -41,9 +41,10 @@ public class SetSpi extends GeneratedSetSpi {
    41 41
    42 42 
         @Override
    43 43 
         public void toDto(ReferentialLocale referentialLocale, Set entity, SetDto dto) {
    44 
    -        super.toDto(referentialLocale, entity, dto);
    45 44 
             dto.setSampleMeasureEnabled(entity.canUseSample());
    46 45 
             dto.setNonTargetCatchReleaseEnabled(entity.canUseNonTargetCatchRelease());
    46 
    +        dto.setSampleMeasureSize(entity.getSampleMeasureSize());
    47 
    +        super.toDto(referentialLocale, entity, dto);
    47 48 
         }
    48 49
    49 50 
         @Override

  • model/src/main/models/Observe/persistence/20-data-ps-observation.model
    ... ... @@ -117,6 +117,7 @@ canUseNonTargetCatchRelease() boolean
    117 117 
     isFreeSchoolType() boolean
    118 118 
     isSchoolObjectType() boolean
    119 119 
     isUnknownSchoolType() boolean
    120 
    +getSampleMeasureSize() int
    120 121
    121 122 
     data.ps.observation.TransmittingBuoy > data.DataEntity
    122 123 
     comment + {*:1} String

  • server/core/src/main/java/fr/ird/observe/server/ObserveWebMainHandler.java
    ... ... @@ -31,7 +31,6 @@ import org.debux.webmotion.server.handler.ExecutorMethodInvokerHandler;
    31 31 
     import org.debux.webmotion.server.handler.ExecutorParametersConvertorHandler;
    32 32 
     import org.debux.webmotion.server.handler.FilterFinderHandler;
    33 33 
     import org.debux.webmotion.server.handler.FilterMethodFinderHandler;
    34 
    -import org.debux.webmotion.server.handler.ParametersExtractorHandler;
    35 34 
     import org.debux.webmotion.server.handler.ParametersMultipartHandler;
    36 35 
     import org.debux.webmotion.server.tools.OrderedList;
    37 36
    ... ... @@ -59,8 +58,10 @@ public class ObserveWebMainHandler extends WebMotionMainHandler {
    59 58 
         @Override
    60 59 
         public OrderedList<Class<? extends WebMotionHandler>> getExecutorHandlers() {
    61 60 
             return OrderedList.asList(
    61 
    +                //FIXME Replace with by a better version of it
    62 62 
                     ExecutorInstanceCreatorHandler.class,
    63 63 
                     ObserveExecutorParametersInjectorHandler.class,
    64 
    +                //FIXME Replace with by a better version of it
    64 65 
                     ExecutorParametersConvertorHandler.class
    65 66 
             );
    66 67 
         }

  • server/runner/src/main/webResources/doc/api/public/referential/ps/common/ObjectMaterial/validation-create-error.xml
    ... ... @@ -38,7 +38,7 @@
    38 38 
         <!-- code must be compliant with his parent code -->
    39 39 
         <field-validator type="fieldexpression" short-circuit="true">
    40 40 
           <param name="expression">
    41 
    -        <![CDATA[ parent == null || parent.code == null || code.startsWith(parent.code + "-") ]]>
    41 
    +        <![CDATA[ codeValid ]]>
    42 42 
           </param>
    43 43 
           <message>observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode##${parent.code}</message>
    44 44 
         </field-validator>

  • server/runner/src/main/webResources/doc/api/public/referential/ps/common/ObjectMaterial/validation-update-error.xml
    ... ... @@ -38,7 +38,7 @@
    38 38 
         <!-- code must be compliant with his parent code -->
    39 39 
         <field-validator type="fieldexpression" short-circuit="true">
    40 40 
           <param name="expression">
    41 
    -        <![CDATA[ parent == null || parent.code == null || code.startsWith(parent.code + "-") ]]>
    41 
    +        <![CDATA[ codeValid ]]>
    42 42 
           </param>
    43 43 
           <message>observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode##${parent.code}</message>
    44 44 
         </field-validator>

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