Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 851b44ae by Tony Chemit at 2020-07-06T14:15:33+02:00 Petite amélioration cosmétique (c kdo) - - - - - 4 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java - pom.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUIHandler.java ===================================== @@ -102,8 +102,10 @@ public abstract class AbstractSampleUIHandler<E extends IdDto, D extends IdDto, protected abstract void onLengthChanged(Float newValue); void loadSizeMeasureTypes() { - List<SizeMeasureTypeReference> sizeMeasureTypeReferences = getModel().getReferentialReferences(NonTargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE); - sizeMeasureTypeReferenceMap = Maps.uniqueIndex(sizeMeasureTypeReferences, SizeMeasureTypeReference::getTopiaId); + if (sizeMeasureTypeReferenceMap == null) { + List<SizeMeasureTypeReference> sizeMeasureTypeReferences = getModel().getReferentialReferences(NonTargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE); + sizeMeasureTypeReferenceMap = Maps.uniqueIndex(sizeMeasureTypeReferences, SizeMeasureTypeReference::getId); + } } Optional<SizeMeasureTypeReference> getSpeciesDefaultSizeMeasureType(SpeciesReference species) { @@ -112,7 +114,7 @@ public abstract class AbstractSampleUIHandler<E extends IdDto, D extends IdDto, String sizeMeasureId = species.getSizeMeasureTypeId(); result = sizeMeasureTypeReferenceMap.get(sizeMeasureId); log.info("Use as default size measure type: " + result); - } else { + } else { log.info("No default size measure type defined (species is null, or no default size measure definied on it."); } return Optional.ofNullable(result); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java ===================================== @@ -72,6 +72,12 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS }); } + @Override + public void afterInit(NonTargetSampleUI ui) { + super.afterInit(ui); + ui.getSizeMeasureType().getToolbarRight().add(ui.getDefaultSizeMeasureType()); + } + @Override public void resetIsWeightComputed() { getTableEditBean().setIsWeightComputed(false); @@ -176,8 +182,9 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS // on passe le mode de saisie updateAcquisitionMode0(AcquisitionMode.valueOf(bean.getAcquisitionMode())); - species = null; sizeMeasureType = Optional.ofNullable(bean.getSizeMeasureType()); + onSpeciesChanged(species); + species = null; } ui.getSizeMeasureType().setSelectedItem(null); @@ -187,6 +194,8 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS log.info(String.format("Will set species : %s", species)); ui.getSpecies().setSelectedItem(null); ui.getSpecies().setSelectedItem(species); + onSpeciesChanged(species); + sizeMeasureType.ifPresent(ui.getSizeMeasureType()::setSelectedItem); } UIHelper.askFocus(requestFocus); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java ===================================== @@ -142,7 +142,8 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar @Override public void afterInit(U ui) { super.afterInit(ui); - + TargetSampleUI ui1 = (TargetSampleUI) ui; + ui1.getSizeMeasureType().getToolbarRight().add(ui1.getDefaultSizeMeasureType()); } @Override @@ -242,12 +243,12 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar sizeMeasureType.ifPresent(sizeMeasureTypeDtoReferentialReference -> ui.getSizeMeasureType().setSelectedItem(sizeMeasureTypeDtoReferentialReference)); // on met a jour l'espece - ui.getSpecies().setSelectedItem(null); if (species != null) { - if (log.isDebugEnabled()) { - log.debug("species to use " + species); - } + log.debug(String.format("species to use %s", species)); + ui.getSpecies().setSelectedItem(null); ui.getSpecies().setSelectedItem(species); + onSpeciesChanged(species); + sizeMeasureType.ifPresent(ui.getSizeMeasureType()::setSelectedItem); } UIHelper.askFocus(requestFocus); @@ -260,10 +261,9 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar public void openUI() { super.openUI(); - List<SizeMeasureTypeReference> sizeMeasureTypes = getReferentialReferences(SizeMeasureTypeReference.class); - List<SizeMeasureTypeReference> data = SizeMeasureTypeHelper.filterForSeine(sizeMeasureTypes); - log.info("Using " + data.size() + " size measure type(s)."); loadSizeMeasureTypes(); + List<SizeMeasureTypeReference> data = SizeMeasureTypeHelper.filterForSeine(sizeMeasureTypeReferenceMap.values()); + log.info("Using " + data.size() + " size measure type(s)."); checkSizeMeasureTypes(data); ((TargetSampleUI) getUi()).getSizeMeasureType().setData(data); } @@ -360,6 +360,7 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar loadReferentialReferenceSetsInModel(form); getModel().setForm(form); TargetSampleHelper.copyTargetSampleDto(form.getObject(), getBean()); + loadSizeMeasureTypes(); } @Override ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.36</version> + <version>2020.39</version> </parent> <groupId>fr.ird.observe</groupId> @@ -170,7 +170,7 @@ <!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>--> <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>--> - <lib.version.java4all.jaxx>3.0-alpha-74</lib.version.java4all.jaxx> + <!-- lib.version.java4all.jaxx>3.0-alpha-75</lib.version.java4all.jaxx>--> <!--<lib.version.java4all.i18n>4.0-beta-8-SNAPSHOT</lib.version.java4all.i18n>--> <!--<lib.version.nuiton.topia>3.6-SNAPSHOT</lib.version.nuiton.topia>--> <!--<lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>--> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/851b44aeb69bb50e16b71a5415... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/851b44aeb69bb50e16b71a5415... You're receiving this email because of your account on gitlab.com.