Tony CHEMIT pushed to branch develop-9.2.x at ultreiaio / ird-observe Commits: 85d5435a by Tony Chemit at 2024-01-22T12:24:16+01:00 update pom - - - - - 039baf2c by Tony Chemit at 2024-01-22T12:24:16+01:00 Sur l'écran de définition Non déclenchement du bouton Enregistrer - Closes #2825 - - - - - 4 changed files: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jaxx - client/datasource/editor/spi/pom.xml - pom.xml Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUI.jaxx ===================================== @@ -67,6 +67,7 @@ <field name="transmittingBuoyOwnership" component="transmittingBuoyOwnership1"/> <field name="code" component="code1"/> <field name="country" component="country1"/> + <field name="vessel" component="vessel1"/> <field name='longitude' component='coordinate1'/> <field name='latitude' component='coordinate1'/> <field name='quadrant' component='coordinate1'/> @@ -80,6 +81,7 @@ <field name="transmittingBuoyOwnership" component="transmittingBuoyOwnership2"/> <field name="code" component="code2"/> <field name="country" component="country2"/> + <field name="vessel" component="vessel2"/> <field name='comment' component='comment2'/> </BeanValidator> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jaxx ===================================== @@ -68,6 +68,7 @@ <field name="transmittingBuoyOwnership" component="transmittingBuoyOwnership1"/> <field name="code" component="code1"/> <field name="country" component="country1"/> + <field name="vessel" component="vessel1"/> <field name='longitude' component='coordinate1'/> <field name='latitude' component='coordinate1'/> <field name='quadrant' component='coordinate1'/> @@ -81,6 +82,7 @@ <field name="transmittingBuoyOwnership" component="transmittingBuoyOwnership2"/> <field name="code" component="code2"/> <field name="country" component="country2"/> + <field name="vessel" component="vessel2"/> <field name='comment' component='comment2'/> </BeanValidator> @@ -229,7 +231,7 @@ <JLabel id='vessel1Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <FilterableComboBox id='vessel1' genericType='VesselReference'/> + <FilterableComboBox id='vessel1' genericType='VesselReference' beanScope="transmittingBuoy1"/> </cell> </row> <row> ===================================== client/datasource/editor/spi/pom.xml ===================================== @@ -154,6 +154,18 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <configuration> + <goalPrefix>client-datasource-editor-spi</goalPrefix> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> <profiles> <profile> <id>reporting</id> ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.47</version> + <version>2024.02</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -129,6 +129,7 @@ <!-- FIXME <lib.version.jts>1.18.2</lib.version.jts>--> <lib.version.hsqldb>2.7.0</lib.version.hsqldb> <!-- FIXME <lib.version.hsqldb>2.7.1</lib.version.hsqldb>--> + <lib.version.java4all.http>1.0.47</lib.version.java4all.http> <!-- license header configuration --> <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Ultreia.io</license.organizationName> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/73f18317513427da98da10fe1... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/73f18317513427da98da10fe1... You're receiving this email because of your account on gitlab.com.