Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
-
46c0980f
by tchemit at 2019-02-19T15:25:59Z
5 changed files:
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionUI.jaxx
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionUI.jaxx
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/FloatlinesCompositionUI.jaxx
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/HooksCompositionUI.jaxx
- pom.xml
Changes:
| ... | ... | @@ -58,6 +58,7 @@ |
| 58 | 58 |
beanClass='fr.ird.observe.dto.data.longline.SetLonglineGlobalCompositionDto'
|
| 59 | 59 |
errorTableModel='{getErrorTableModel()}'>
|
| 60 | 60 |
<field name="baitsComposition" component="editorPanel"/>
|
| 61 |
+ <field name="baitsCompositionProportionSum" component="proportionSum"/>
|
|
| 61 | 62 |
</BeanValidator>
|
| 62 | 63 |
|
| 63 | 64 |
<!-- le validateur d'une entrée de tableau -->
|
| ... | ... | @@ -57,6 +57,7 @@ |
| 57 | 57 |
beanClass='fr.ird.observe.dto.data.longline.SetLonglineGlobalCompositionDto'
|
| 58 | 58 |
errorTableModel='{getErrorTableModel()}'>
|
| 59 | 59 |
<field name="branchlinesComposition" component="editorPanel"/>
|
| 60 |
+ <field name="branchlinesCompositionProportionSum" component="proportionSum"/>
|
|
| 60 | 61 |
</BeanValidator>
|
| 61 | 62 |
|
| 62 | 63 |
<!-- le validateur d'une entrée de tableau -->
|
| ... | ... | @@ -57,6 +57,7 @@ |
| 57 | 57 |
beanClass='fr.ird.observe.dto.data.longline.SetLonglineGlobalCompositionDto'
|
| 58 | 58 |
errorTableModel='{getErrorTableModel()}'>
|
| 59 | 59 |
<field name="floatlinesComposition" component="editorPanel"/>
|
| 60 |
+ <field name="floatlinesCompositionProportionSum" component="proportionSum"/>
|
|
| 60 | 61 |
</BeanValidator>
|
| 61 | 62 |
|
| 62 | 63 |
<!-- le validateur d'une entrée de tableau -->
|
| ... | ... | @@ -58,6 +58,7 @@ |
| 58 | 58 |
beanClass='fr.ird.observe.dto.data.longline.SetLonglineGlobalCompositionDto'
|
| 59 | 59 |
errorTableModel='{getErrorTableModel()}'>
|
| 60 | 60 |
<field name="hooksComposition" component="editorPanel"/>
|
| 61 |
+ <field name="hooksCompositionProportionSum" component="proportionSum"/>
|
|
| 61 | 62 |
</BeanValidator>
|
| 62 | 63 |
|
| 63 | 64 |
<!-- le validateur d'une entrée de tableau -->
|
| ... | ... | @@ -155,7 +155,7 @@ |
| 155 | 155 |
<maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
|
| 156 | 156 |
<buildDate>${maven.build.timestamp}</buildDate>
|
| 157 | 157 |
|
| 158 |
- <observeToolkitVersion>3.7.15</observeToolkitVersion>
|
|
| 158 |
+ <observeToolkitVersion>3.7.16</observeToolkitVersion>
|
|
| 159 | 159 |
<!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>-->
|
| 160 | 160 |
<lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
|
| 161 | 161 |
<!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>-->
|