Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f58b7358 by Tony Chemit at 2022-03-18T09:53:53+01:00 add FIXME - - - - - 9d5dda9f by Tony Chemit at 2022-03-18T10:47:24+01:00 Plein d'échantillons, comptage de l'arbre : 0 - Closes #2219 - - - - - 1a567975 by Tony Chemit at 2022-03-18T10:53:45+01:00 Correction validation ObjectMaterial (des faux positifs étaient détecté sur tous les fils directs de parent.code == null - - - - - 068e8cb4 by Tony Chemit at 2022-03-18T11:24:29+01:00 Problème de décoration de l'arbre de navigation - Closes #2220 - - - - - 7 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeExecutor.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetImpl.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetSpi.java - model/src/main/models/Observe/persistence/20-data-ps-observation.model - server/core/src/main/java/fr/ird/observe/server/ObserveWebMainHandler.java - server/runner/src/main/webResources/doc/api/public/referential/ps/common/ObjectMaterial/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/referential/ps/common/ObjectMaterial/validation-update-error.xml 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; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import javax.swing.SwingUtilities; import java.util.Objects; /** @@ -115,6 +116,7 @@ public class ChangeModeExecutor<U extends ContentUI> { selectedNode.reloadNodeData(); selectedNode.nodeChangedDeep(); afterOpenReselectNode(ui, dataSourceEditor, tree, selectedNode, id); + SwingUtilities.invokeLater(tree::invalidateCellSizeCache); } 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 { public boolean isUnknownSchoolType() { return schoolType != null && ProtectedIdsPs.PS_COMMON_SCHOOL_TYPE_UNDEFINED_ID.equals(schoolType.getTopiaId()); } + + @Override + public int getSampleMeasureSize() { + if (isSampleEmpty()) { + return 0; + } + return getSample().iterator().next().getSampleMeasureSize(); + } } ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SetSpi.java ===================================== @@ -41,9 +41,10 @@ public class SetSpi extends GeneratedSetSpi { @Override public void toDto(ReferentialLocale referentialLocale, Set entity, SetDto dto) { - super.toDto(referentialLocale, entity, dto); dto.setSampleMeasureEnabled(entity.canUseSample()); dto.setNonTargetCatchReleaseEnabled(entity.canUseNonTargetCatchRelease()); + dto.setSampleMeasureSize(entity.getSampleMeasureSize()); + super.toDto(referentialLocale, entity, dto); } @Override ===================================== model/src/main/models/Observe/persistence/20-data-ps-observation.model ===================================== @@ -117,6 +117,7 @@ canUseNonTargetCatchRelease() boolean isFreeSchoolType() boolean isSchoolObjectType() boolean isUnknownSchoolType() boolean +getSampleMeasureSize() int data.ps.observation.TransmittingBuoy > data.DataEntity 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; import org.debux.webmotion.server.handler.ExecutorParametersConvertorHandler; import org.debux.webmotion.server.handler.FilterFinderHandler; import org.debux.webmotion.server.handler.FilterMethodFinderHandler; -import org.debux.webmotion.server.handler.ParametersExtractorHandler; import org.debux.webmotion.server.handler.ParametersMultipartHandler; import org.debux.webmotion.server.tools.OrderedList; @@ -59,8 +58,10 @@ public class ObserveWebMainHandler extends WebMotionMainHandler { @Override public OrderedList<Class<? extends WebMotionHandler>> getExecutorHandlers() { return OrderedList.asList( + //FIXME Replace with by a better version of it ExecutorInstanceCreatorHandler.class, ObserveExecutorParametersInjectorHandler.class, + //FIXME Replace with by a better version of it ExecutorParametersConvertorHandler.class ); } ===================================== server/runner/src/main/webResources/doc/api/public/referential/ps/common/ObjectMaterial/validation-create-error.xml ===================================== @@ -38,7 +38,7 @@ <!-- code must be compliant with his parent code --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ parent == null || parent.code == null || code.startsWith(parent.code + "-") ]]> + <![CDATA[ codeValid ]]> </param> <message>observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode##${parent.code}</message> </field-validator> ===================================== server/runner/src/main/webResources/doc/api/public/referential/ps/common/ObjectMaterial/validation-update-error.xml ===================================== @@ -38,7 +38,7 @@ <!-- code must be compliant with his parent code --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ parent == null || parent.code == null || code.startsWith(parent.code + "-") ]]> + <![CDATA[ codeValid ]]> </param> <message>observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode##${parent.code}</message> </field-validator> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6883c98a842015f693cdd0a5e... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6883c98a842015f693cdd0a5e... You're receiving this email because of your account on gitlab.com.