Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
-
9f155e2e
by Tony Chemit at 2020-07-06T13:21:54+02:00
3 changed files:
- 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:
| ... | ... | @@ -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);
|
| ... | ... | @@ -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
|
| ... | ... | @@ -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>-->
|