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
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:
| ... | ... | @@ -102,8 +102,10 @@ public abstract class AbstractSampleUIHandler<E extends IdDto, D extends IdDto, |
| 102 | 102 |
protected abstract void onLengthChanged(Float newValue);
|
| 103 | 103 |
|
| 104 | 104 |
void loadSizeMeasureTypes() {
|
| 105 |
- List<SizeMeasureTypeReference> sizeMeasureTypeReferences = getModel().getReferentialReferences(NonTargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE);
|
|
| 106 |
- sizeMeasureTypeReferenceMap = Maps.uniqueIndex(sizeMeasureTypeReferences, SizeMeasureTypeReference::getTopiaId);
|
|
| 105 |
+ if (sizeMeasureTypeReferenceMap == null) {
|
|
| 106 |
+ List<SizeMeasureTypeReference> sizeMeasureTypeReferences = getModel().getReferentialReferences(NonTargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE);
|
|
| 107 |
+ sizeMeasureTypeReferenceMap = Maps.uniqueIndex(sizeMeasureTypeReferences, SizeMeasureTypeReference::getId);
|
|
| 108 |
+ }
|
|
| 107 | 109 |
}
|
| 108 | 110 |
|
| 109 | 111 |
Optional<SizeMeasureTypeReference> getSpeciesDefaultSizeMeasureType(SpeciesReference species) {
|
| ... | ... | @@ -112,7 +114,7 @@ public abstract class AbstractSampleUIHandler<E extends IdDto, D extends IdDto, |
| 112 | 114 |
String sizeMeasureId = species.getSizeMeasureTypeId();
|
| 113 | 115 |
result = sizeMeasureTypeReferenceMap.get(sizeMeasureId);
|
| 114 | 116 |
log.info("Use as default size measure type: " + result);
|
| 115 |
- } else {
|
|
| 117 |
+ } else {
|
|
| 116 | 118 |
log.info("No default size measure type defined (species is null, or no default size measure definied on it.");
|
| 117 | 119 |
}
|
| 118 | 120 |
return Optional.ofNullable(result);
|
| ... | ... | @@ -72,6 +72,12 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS |
| 72 | 72 |
});
|
| 73 | 73 |
}
|
| 74 | 74 |
|
| 75 |
+ @Override
|
|
| 76 |
+ public void afterInit(NonTargetSampleUI ui) {
|
|
| 77 |
+ super.afterInit(ui);
|
|
| 78 |
+ ui.getSizeMeasureType().getToolbarRight().add(ui.getDefaultSizeMeasureType());
|
|
| 79 |
+ }
|
|
| 80 |
+ |
|
| 75 | 81 |
@Override
|
| 76 | 82 |
public void resetIsWeightComputed() {
|
| 77 | 83 |
getTableEditBean().setIsWeightComputed(false);
|
| ... | ... | @@ -176,8 +182,9 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS |
| 176 | 182 |
|
| 177 | 183 |
// on passe le mode de saisie
|
| 178 | 184 |
updateAcquisitionMode0(AcquisitionMode.valueOf(bean.getAcquisitionMode()));
|
| 179 |
- species = null;
|
|
| 180 | 185 |
sizeMeasureType = Optional.ofNullable(bean.getSizeMeasureType());
|
| 186 |
+ onSpeciesChanged(species);
|
|
| 187 |
+ species = null;
|
|
| 181 | 188 |
}
|
| 182 | 189 |
|
| 183 | 190 |
ui.getSizeMeasureType().setSelectedItem(null);
|
| ... | ... | @@ -187,6 +194,8 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS |
| 187 | 194 |
log.info(String.format("Will set species : %s", species));
|
| 188 | 195 |
ui.getSpecies().setSelectedItem(null);
|
| 189 | 196 |
ui.getSpecies().setSelectedItem(species);
|
| 197 |
+ onSpeciesChanged(species);
|
|
| 198 |
+ sizeMeasureType.ifPresent(ui.getSizeMeasureType()::setSelectedItem);
|
|
| 190 | 199 |
}
|
| 191 | 200 |
UIHelper.askFocus(requestFocus);
|
| 192 | 201 |
|
| ... | ... | @@ -142,7 +142,8 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar |
| 142 | 142 |
@Override
|
| 143 | 143 |
public void afterInit(U ui) {
|
| 144 | 144 |
super.afterInit(ui);
|
| 145 |
- |
|
| 145 |
+ TargetSampleUI ui1 = (TargetSampleUI) ui;
|
|
| 146 |
+ ui1.getSizeMeasureType().getToolbarRight().add(ui1.getDefaultSizeMeasureType());
|
|
| 146 | 147 |
}
|
| 147 | 148 |
|
| 148 | 149 |
@Override
|
| ... | ... | @@ -242,12 +243,12 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar |
| 242 | 243 |
sizeMeasureType.ifPresent(sizeMeasureTypeDtoReferentialReference -> ui.getSizeMeasureType().setSelectedItem(sizeMeasureTypeDtoReferentialReference));
|
| 243 | 244 |
|
| 244 | 245 |
// on met a jour l'espece
|
| 245 |
- ui.getSpecies().setSelectedItem(null);
|
|
| 246 | 246 |
if (species != null) {
|
| 247 |
- if (log.isDebugEnabled()) {
|
|
| 248 |
- log.debug("species to use " + species);
|
|
| 249 |
- }
|
|
| 247 |
+ log.debug(String.format("species to use %s", species));
|
|
| 248 |
+ ui.getSpecies().setSelectedItem(null);
|
|
| 250 | 249 |
ui.getSpecies().setSelectedItem(species);
|
| 250 |
+ onSpeciesChanged(species);
|
|
| 251 |
+ sizeMeasureType.ifPresent(ui.getSizeMeasureType()::setSelectedItem);
|
|
| 251 | 252 |
}
|
| 252 | 253 |
UIHelper.askFocus(requestFocus);
|
| 253 | 254 |
|
| ... | ... | @@ -260,10 +261,9 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar |
| 260 | 261 |
public void openUI() {
|
| 261 | 262 |
super.openUI();
|
| 262 | 263 |
|
| 263 |
- List<SizeMeasureTypeReference> sizeMeasureTypes = getReferentialReferences(SizeMeasureTypeReference.class);
|
|
| 264 |
- List<SizeMeasureTypeReference> data = SizeMeasureTypeHelper.filterForSeine(sizeMeasureTypes);
|
|
| 265 |
- log.info("Using " + data.size() + " size measure type(s).");
|
|
| 266 | 264 |
loadSizeMeasureTypes();
|
| 265 |
+ List<SizeMeasureTypeReference> data = SizeMeasureTypeHelper.filterForSeine(sizeMeasureTypeReferenceMap.values());
|
|
| 266 |
+ log.info("Using " + data.size() + " size measure type(s).");
|
|
| 267 | 267 |
checkSizeMeasureTypes(data);
|
| 268 | 268 |
((TargetSampleUI) getUi()).getSizeMeasureType().setData(data);
|
| 269 | 269 |
}
|
| ... | ... | @@ -360,6 +360,7 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar |
| 360 | 360 |
loadReferentialReferenceSetsInModel(form);
|
| 361 | 361 |
getModel().setForm(form);
|
| 362 | 362 |
TargetSampleHelper.copyTargetSampleDto(form.getObject(), getBean());
|
| 363 |
+ loadSizeMeasureTypes();
|
|
| 363 | 364 |
}
|
| 364 | 365 |
|
| 365 | 366 |
@Override
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>io.ultreia.maven</groupId>
|
| 26 | 26 |
<artifactId>pom</artifactId>
|
| 27 |
- <version>2020.36</version>
|
|
| 27 |
+ <version>2020.39</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<groupId>fr.ird.observe</groupId>
|
| ... | ... | @@ -170,7 +170,7 @@ |
| 170 | 170 |
|
| 171 | 171 |
<!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>-->
|
| 172 | 172 |
<!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>-->
|
| 173 |
- <lib.version.java4all.jaxx>3.0-alpha-74</lib.version.java4all.jaxx>
|
|
| 173 |
+ <!-- lib.version.java4all.jaxx>3.0-alpha-75</lib.version.java4all.jaxx>-->
|
|
| 174 | 174 |
<!--<lib.version.java4all.i18n>4.0-beta-8-SNAPSHOT</lib.version.java4all.i18n>-->
|
| 175 | 175 |
<!--<lib.version.nuiton.topia>3.6-SNAPSHOT</lib.version.nuiton.topia>-->
|
| 176 | 176 |
<!--<lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>-->
|