- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] Problème sur la gestion des référentiels manquant lors d'un import - Closes #1784
by Tony CHEMIT 10 Feb '21

10 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c1620875 by Tony Chemit at 2021-02-10T18:23:08+01:00 Problème sur la gestion des référentiels manquant lors d'un import - Closes #1784 - - - - - 1 changed file: - services/local-impl/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialShellBuilder.java Changes: ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialShellBuilder.java ===================================== @@ -42,22 +42,6 @@ public class ReferentialShellBuilder { private final GetEntityReferentialShellVisitor visitor; - private ReferentialShellBuilder(ImmutableSetStringMap incomingReferentialIds) { - visitor = new GetEntityReferentialShellVisitor(incomingReferentialIds); - } - - public static ReferentialShellBuilder builder(ImmutableSetStringMap incomingReferentialIds) { - return new ReferentialShellBuilder(incomingReferentialIds); - } - - void scan(TopiaEntity entity) { - entity.accept(visitor); - } - - public ImmutableSetStringMap build() { - return visitor.missingReferentialIds.build(); - } - private static class GetEntityReferentialShellVisitor implements TopiaEntityVisitor { private final Set<String> hitIds; @@ -100,11 +84,11 @@ public class ReferentialShellBuilder { @Override public void visit(TopiaEntity entity, String propertyName, Class<?> collectionType, Class<?> type, Object value) { - if (TopiaEntity.class.isAssignableFrom(type)) - for (Object child : ((Collection<?>) value)) { - ((TopiaEntity) child).accept(this); + if (TopiaEntity.class.isAssignableFrom(type)) { + for (Object child : ((Collection<?>) value)) { + ((TopiaEntity) child).accept(this); + } } - } @Override @@ -120,4 +104,20 @@ public class ReferentialShellBuilder { } } + public static ReferentialShellBuilder builder(ImmutableSetStringMap incomingReferentialIds) { + return new ReferentialShellBuilder(incomingReferentialIds); + } + + private ReferentialShellBuilder(ImmutableSetStringMap incomingReferentialIds) { + visitor = new GetEntityReferentialShellVisitor(incomingReferentialIds); + } + + void scan(TopiaEntity entity) { + entity.accept(visitor); + } + + public ImmutableSetStringMap build() { + return visitor.missingReferentialIds.build(); + } + } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c1620875650a55fab1e9ba07e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c1620875650a55fab1e9ba07e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Problème sur la gestion des référentiels manquant lors d'un import - Closes #1784
by Tony CHEMIT 10 Feb '21

10 Feb '21

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 87dd7e14 by Tony Chemit at 2021-02-10T18:11:16+01:00 Problème sur la gestion des référentiels manquant lors d'un import - Closes #1784 - - - - - 1 changed file: - services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialShellBuilder.java Changes: ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialShellBuilder.java ===================================== @@ -28,6 +28,7 @@ import fr.ird.observe.spi.map.ImmutableSetStringMap; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityVisitor; +import java.util.Collection; import java.util.Set; import java.util.TreeSet; @@ -99,7 +100,11 @@ public class ReferentialShellBuilder { @Override public void visit(TopiaEntity entity, String propertyName, Class<?> collectionType, Class<?> type, Object value) { - + if (TopiaEntity.class.isAssignableFrom(type)) { + for (Object child : ((Collection<?>) value)) { + ((TopiaEntity) child).accept(this); + } + } } @Override View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/87dd7e14da1f7ce7eb956809b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/87dd7e14da1f7ce7eb956809b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix application-assembly profiles: should be able to get a minimal assembly...
by Tony CHEMIT 10 Feb '21

10 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bd51318e by Tony Chemit at 2021-02-10T17:32:01+01:00 fix application-assembly profiles: should be able to get a minimal assembly zip on not release build. - - - - - 2 changed files: - client/runner/pom.xml - pom.xml Changes: ===================================== client/runner/pom.xml ===================================== @@ -261,9 +261,20 @@ <goal>run</goal> </goals> </execution> + <execution> + <id>Prepare release files</id> + <phase>integration-test</phase> + <configuration> + <target> + <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/${applicationJarName}.jar" /> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> </executions> </plugin> - </plugins> </build> @@ -280,22 +291,17 @@ <properties> <devMode>false</devMode> </properties> - <build> - <plugins> - <plugin> <artifactId>maven-antrun-plugin</artifactId> <inherited>false</inherited> <executions> - <execution> <id>Prepare release files</id> <phase>integration-test</phase> <configuration> <target> - <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/${applicationJarName}.jar" /> <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.exe" tofile="${project.build.directory}/${applicationJarName}.exe" /> </target> </configuration> @@ -305,9 +311,9 @@ </execution> </executions> </plugin> - </plugins> </build> </profile> + </profiles> </project> ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2021.8</version> + <version>2021.9</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bd51318e2eec8d0e117e07611… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bd51318e2eec8d0e117e07611… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix application-assembly profiles: should be able to get a minimal assembly...
by Tony CHEMIT 10 Feb '21

10 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1fd71dca by Tony Chemit at 2021-02-10T17:15:40+01:00 fix application-assembly profiles: should be able to get a minimal assembly zip on not release build. - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2021.8</version> + <version>2021.9</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1fd71dcae9da83c749b6d0001… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1fd71dcae9da83c749b6d0001… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Fix simple gitlab build
by Tony CHEMIT 10 Feb '21

10 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: efc3fb98 by Tony Chemit at 2021-02-10T16:01:57+01:00 Fix simple gitlab build - - - - - 1 changed file: - client/runner/pom.xml Changes: ===================================== client/runner/pom.xml ===================================== @@ -261,9 +261,21 @@ <goal>run</goal> </goals> </execution> + <execution> + <id>Prepare release files</id> + <phase>integration-test</phase> + <configuration> + <target> + <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/${applicationJarName}.jar" /> + <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.exe" tofile="${project.build.directory}/${applicationJarName}.exe" /> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> </executions> </plugin> - </plugins> </build> @@ -280,34 +292,6 @@ <properties> <devMode>false</devMode> </properties> - - <build> - - <plugins> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <inherited>false</inherited> - <executions> - - <execution> - <id>Prepare release files</id> - <phase>integration-test</phase> - <configuration> - <target> - <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/${applicationJarName}.jar" /> - <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.exe" tofile="${project.build.directory}/${applicationJarName}.exe" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> </profile> </profiles> </project> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/efc3fb98912fe9034d6a877d1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/efc3fb98912fe9034d6a877d1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Impossible d'importer des données en mode avancé - Closes #1783
by Tony CHEMIT 10 Feb '21

10 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 98a2f918 by Tony Chemit at 2021-02-10T14:21:42+01:00 Impossible d'importer des données en mode avancé - Closes #1783 - - - - - 8aceee3b by Tony Chemit at 2021-02-10T14:23:48+01:00 Finaliser les tests automatisés de services - See #1785 Stash before moving to home - - - - - b85fb01d by Tony Chemit at 2021-02-10T14:24:21+01:00 Impossible d'importer des données en mode avancé - Closes #1783 Fix get missing referential on any collection :( - - - - - 30 changed files: - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java - + client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Apply.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - + client/datasource/editor/api/src/main/i18n/templates/showMissingReferential_en_GB.ftl - + client/datasource/editor/api/src/main/i18n/templates/showMissingReferential_es_ES.ftl - + client/datasource/editor/api/src/main/i18n/templates/showMissingReferential_fr_FR.ftl - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/reset/DefaultResetAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/actions/DeleteEdit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/DeleteMultiple.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/actions/DeleteOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/DeleteReferential.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/ShowUsagesReferential.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDeleteUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDesactivateUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDisplayUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDisplayUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageUIHandlerSupport.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsagesGetter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/actions/SelectUnselect.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTree.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationNode.java - services/api-test/src/main/java/fr/ird/observe/services/service/ObserveServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ContainerDataServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/OpenableDataServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/common/TripServiceFixtures.java - services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/common/TripServiceFixtures.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7f39554694fbfbc65a9febc1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7f39554694fbfbc65a9febc1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update pom
by Tony CHEMIT 09 Feb '21

09 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7f395546 by Tony Chemit at 2021-02-09T15:10:16+01:00 update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2021.7</version> + <version>2021.8</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7f39554694fbfbc65a9febc17… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7f39554694fbfbc65a9febc17… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Problème de sauvegardes des échantillons - Closes #1780
by Tony CHEMIT 09 Feb '21

09 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cd0ea9b3 by Tony Chemit at 2021-02-09T09:59:46+01:00 Problème de sauvegardes des échantillons - Closes #1780 - - - - - 2ee01f5d by Tony Chemit at 2021-02-09T13:06:54+01:00 Mauvaise disposition de l'encadré des espèces et quelques améliorations sur les deux écrans - See #1781 - - - - - 3af924ab by Tony Chemit at 2021-02-09T13:13:50+01:00 On en voit plus les DCP! - See #1782 - - - - - 9 changed files: - client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/DiscardedTargetSampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/DiscardedTargetSampleUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/KeptTargetSampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/KeptTargetSampleUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/NonTargetSampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/NonTargetSampleUIHandler.java - pom.xml - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SampleDataServiceLocalSupport.java Changes: ===================================== client/datasource/editor/api/src/main/resources/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss ===================================== @@ -25,7 +25,7 @@ } #acquisitionModePanel { - border:{new TitledBorder(t("observe.data.Data.acquisitionMode"))}; + border:{new TitledBorder(new javax.swing.border.EmptyBorder(0,0,0,0), t("observe.data.Data.acquisitionMode"))}; } #acquisitionModeNumber { @@ -45,7 +45,7 @@ } #speciesAndMeasureTypesPanel { - border:{new TitledBorder(t("observe.data.Data.speciesAndMeasureTypes"))}; + border:{new TitledBorder(new javax.swing.border.EmptyBorder(0,0,0,0), t("observe.data.Data.speciesAndMeasureTypes"))}; } #sizeMeasureType { ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/DiscardedTargetSampleUI.jaxx ===================================== @@ -70,42 +70,42 @@ <Table id='editorPanel' fill='both' insets='1' beanScope="tableEditBean" _tableEditors='{newComponentArray(species,sex,sizeMeasureType,length,weight,count)}'> -  +  <row> - <cell columns="3"> - <JPanel id="modeAndCodePanel" layout='{new BorderLayout()}'> - <JPanel id='acquisitionModePanel' constraints="BorderLayout.CENTER" layout="{new GridLayout(0, 1)}"> - <JRadioButton id='acquisitionModeNumber'/> - <JRadioButton id='acquisitionModeIndividual'/> - </JPanel> - <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1' constraints="BorderLayout.EAST"> - <row> - <cell> - <JLabel id='speciesLabel' styleClass="i18n"/> - </cell> - <cell weightx="1"> - <JaxxComboBox id='species' genericType='SpeciesReference'/> - </cell> - </row> - <row> - <cell> - <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/> - </cell> - <cell> - <JaxxComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/> - </cell> - </row> - <row> - <cell> - <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/> - </cell> - <cell> - <JaxxComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/> - </cell> - </row> - </Table> + <cell> + <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}"> + <JRadioButton id='acquisitionModeNumber'/> + <JRadioButton id='acquisitionModeIndividual'/> </JPanel> </cell> + <cell weightx='1' anchor='east'> + <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1'> + <row> + <cell> + <JLabel id='speciesLabel' styleClass="i18n"/> + </cell> + <cell weightx="1"> + <JaxxComboBox id='species' genericType='SpeciesReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/> + </cell> + <cell> + <JaxxComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/> + </cell> + <cell> + <JaxxComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/> + </cell> + </row> + </Table> + </cell> </row>  @@ -126,18 +126,13 @@ <cell weightx='1' anchor='east'> <NumberEditor id='length' styleClass="float1"/> </cell> - <cell anchor='east'> - <JToolBar id='lengthSourceAction'> - <JButton id='lengthSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsLengthComputed()'/> - </JToolBar> - </cell> </row>  <row> <cell> <JLabel id='lengthMeasureMethodLabel'/> </cell> - <cell weightx='1' anchor='east' columns="2"> + <cell weightx='1' anchor='east'> <JaxxComboBox id='lengthMeasureMethod' genericType='LengthMeasureMethodReference'/> </cell> </row> @@ -150,18 +145,13 @@ <cell weightx='1' anchor='east'> <NumberEditor id='weight' styleClass="float2"/> </cell> - <cell anchor='east'> - <JToolBar id='weightSourceAction'> - <JButton id='weightSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsWeightComputed()'/> - </JToolBar> - </cell> </row>  <row> <cell> <JLabel id='weightMeasureMethodLabel'/> </cell> - <cell weightx='1' anchor='east' columns="2"> + <cell weightx='1' anchor='east'> <JaxxComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/> </cell> </row> @@ -198,5 +188,7 @@ <JPanel id="invisible"> <JButton id="defaultSizeMeasureType"/> <JButton id="defaultWeightMeasureType"/> + <JButton id='lengthSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsLengthComputed()'/> + <JButton id='weightSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsWeightComputed()'/> </JPanel> </fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/DiscardedTargetSampleUIHandler.java ===================================== @@ -87,6 +87,8 @@ public class DiscardedTargetSampleUIHandler extends GeneratedDiscardedTargetSamp ui.getAcquisitionModeGroup().addChangeListener(this::onAcquisitionModeChanged); ui.getSizeMeasureType().getToolbarRight().add(ui.getDefaultSizeMeasureType()); ui.getWeightMeasureType().getToolbarRight().add(ui.getDefaultWeightMeasureType()); + ui.getLength().getRightToolbar().add(ui.getLengthSourceInformation()); + ui.getWeight().getRightToolbar().add(ui.getWeightSourceInformation()); ResetSizeMeasureType.install(ui, ui.getDefaultSizeMeasureType(), ui.getSizeMeasureType()); ResetWeightMeasureType.install(ui, ui.getDefaultWeightMeasureType(), ui.getWeightMeasureType()); } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/KeptTargetSampleUI.jaxx ===================================== @@ -69,42 +69,42 @@ <Table id='editorPanel' fill='both' insets='1' beanScope="tableEditBean" _tableEditors='{newComponentArray(species,sex,sizeMeasureType,length,weight,count)}'> -  +  <row> - <cell columns="3"> - <JPanel id="modeAndCodePanel" layout='{new BorderLayout()}'> - <JPanel id='acquisitionModePanel' constraints="BorderLayout.CENTER" layout="{new GridLayout(0, 1)}"> - <JRadioButton id='acquisitionModeNumber'/> - <JRadioButton id='acquisitionModeIndividual'/> - </JPanel> - <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1' constraints="BorderLayout.EAST"> - <row> - <cell> - <JLabel id='speciesLabel' styleClass="i18n"/> - </cell> - <cell weightx="1"> - <JaxxComboBox id='species' genericType='SpeciesReference'/> - </cell> - </row> - <row> - <cell> - <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/> - </cell> - <cell> - <JaxxComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/> - </cell> - </row> - <row> - <cell> - <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/> - </cell> - <cell> - <JaxxComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/> - </cell> - </row> - </Table> + <cell> + <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}"> + <JRadioButton id='acquisitionModeNumber'/> + <JRadioButton id='acquisitionModeIndividual'/> </JPanel> </cell> + <cell weightx='1' anchor='east'> + <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1'> + <row> + <cell> + <JLabel id='speciesLabel' styleClass="i18n"/> + </cell> + <cell weightx="1"> + <JaxxComboBox id='species' genericType='SpeciesReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/> + </cell> + <cell> + <JaxxComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/> + </cell> + <cell> + <JaxxComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/> + </cell> + </row> + </Table> + </cell> </row>  @@ -125,18 +125,13 @@ <cell weightx='1' anchor='east'> <NumberEditor id='length' styleClass="float1"/> </cell> - <cell anchor='east'> - <JToolBar id='lengthSourceAction'> - <JButton id='lengthSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsLengthComputed()'/> - </JToolBar> - </cell> </row>  <row> <cell> <JLabel id='lengthMeasureMethodLabel'/> </cell> - <cell weightx='1' anchor='east' columns="2"> + <cell weightx='1' anchor='east'> <JaxxComboBox id='lengthMeasureMethod' genericType='LengthMeasureMethodReference'/> </cell> </row> @@ -149,18 +144,13 @@ <cell weightx='1' anchor='east'> <NumberEditor id='weight' styleClass="float2"/> </cell> - <cell anchor='east'> - <JToolBar id='weightSourceAction'> - <JButton id='weightSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsWeightComputed()'/> - </JToolBar> - </cell> </row>  <row> <cell> <JLabel id='weightMeasureMethodLabel'/> </cell> - <cell weightx='1' anchor='east' columns="2"> + <cell weightx='1' anchor='east'> <JaxxComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/> </cell> </row> @@ -197,5 +187,7 @@ <JPanel id="invisible"> <JButton id="defaultSizeMeasureType"/> <JButton id="defaultWeightMeasureType"/> + <JButton id='lengthSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsLengthComputed()'/> + <JButton id='weightSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsWeightComputed()'/> </JPanel> </fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/KeptTargetSampleUIHandler.java ===================================== @@ -87,6 +87,8 @@ public class KeptTargetSampleUIHandler extends GeneratedKeptTargetSampleUIHandle ui.getAcquisitionModeGroup().addChangeListener(this::onAcquisitionModeChanged); ui.getSizeMeasureType().getToolbarRight().add(ui.getDefaultSizeMeasureType()); ui.getWeightMeasureType().getToolbarRight().add(ui.getDefaultWeightMeasureType()); + ui.getLength().getRightToolbar().add(ui.getLengthSourceInformation()); + ui.getWeight().getRightToolbar().add(ui.getWeightSourceInformation()); ResetSizeMeasureType.install(ui, ui.getDefaultSizeMeasureType(), ui.getSizeMeasureType()); ResetWeightMeasureType.install(ui, ui.getDefaultWeightMeasureType(), ui.getWeightMeasureType()); } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/NonTargetSampleUI.jaxx ===================================== @@ -71,42 +71,42 @@ <Table id='editorPanel' fill='both' insets='1' beanScope="tableEditBean" _tableEditors='{newComponentArray(species,sizeMeasureType,length,weight,count,sex,speciesFate,picturesReferences)}'> -  +  <row> - <cell columns="3"> - <JPanel id="modeAndCodePanel" layout='{new BorderLayout()}'> - <JPanel id='acquisitionModePanel' constraints="BorderLayout.CENTER" layout="{new GridLayout(0, 1)}"> - <JRadioButton id='acquisitionModeNumber'/> - <JRadioButton id='acquisitionModeIndividual'/> - </JPanel> - <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1' constraints="BorderLayout.EAST"> - <row> - <cell> - <JLabel id='speciesLabel' styleClass="i18n"/> - </cell> - <cell weightx='1'> - <JaxxComboBox id='species' genericType='SpeciesReference'/> - </cell> - </row> - <row> - <cell> - <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/> - </cell> - <cell> - <JaxxComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/> - </cell> - </row> - <row> - <cell> - <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/> - </cell> - <cell> - <JaxxComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/> - </cell> - </row> - </Table> + <cell> + <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}"> + <JRadioButton id='acquisitionModeNumber'/> + <JRadioButton id='acquisitionModeIndividual'/> </JPanel> </cell> + <cell weightx='1' anchor='east'> + <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1'> + <row> + <cell> + <JLabel id='speciesLabel' styleClass="i18n"/> + </cell> + <cell weightx="1"> + <JaxxComboBox id='species' genericType='SpeciesReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/> + </cell> + <cell> + <JaxxComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/> + </cell> + <cell> + <JaxxComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/> + </cell> + </row> + </Table> + </cell> </row>  @@ -117,12 +117,6 @@ <cell weightx='1' anchor='east'> <NumberEditor id='length' styleClass="float1"/> </cell> - <cell anchor='east'> - <JToolBar id='lengthSourceAction'> - <JButton id='lengthSourceInformation' styleClass='computedDataInformation' - onActionPerformed='handler.resetIsLengthComputed()'/> - </JToolBar> - </cell> </row>  @@ -133,19 +127,13 @@ <cell weightx='1' anchor='east'> <NumberEditor id='weight' styleClass="float2"/> </cell> - <cell anchor='east'> - <JToolBar id='weightSourceAction'> - <JButton id='weightSourceInformation' styleClass='computedDataInformation' - onActionPerformed='handler.resetIsWeightComputed()'/> - </JToolBar> - </cell> </row>  <row> <cell> <JLabel id='weightMeasureMethodLabel'/> </cell> - <cell weightx='1' anchor='east' columns="2"> + <cell weightx='1' anchor='east'> <JaxxComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/> </cell> </row> @@ -175,7 +163,7 @@ <cell> <JLabel id='speciesFateLabel'/> </cell> - <cell weightx='1' anchor='east' columns="2"> + <cell weightx='1' anchor='east'> <JaxxComboBox id='speciesFate' genericType='SpeciesFateReference'/> </cell> </row> @@ -212,5 +200,7 @@ <JPanel id="invisible"> <JButton id="defaultSizeMeasureType"/> <JButton id="defaultWeightMeasureType"/> + <JButton id='lengthSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsLengthComputed()'/> + <JButton id='weightSourceInformation' styleClass='computedDataInformation' onActionPerformed='handler.resetIsWeightComputed()'/> </JPanel> </fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/NonTargetSampleUIHandler.java ===================================== @@ -85,6 +85,8 @@ public class NonTargetSampleUIHandler extends GeneratedNonTargetSampleUIHandler ui.getAcquisitionModeGroup().addChangeListener(this::onAcquisitionModeChanged); ui.getSizeMeasureType().getToolbarRight().add(ui.getDefaultSizeMeasureType()); ui.getWeightMeasureType().getToolbarRight().add(ui.getDefaultWeightMeasureType()); + ui.getLength().getRightToolbar().add(ui.getLengthSourceInformation()); + ui.getWeight().getRightToolbar().add(ui.getWeightSourceInformation()); ResetSizeMeasureType.install(ui, ui.getDefaultSizeMeasureType(), ui.getSizeMeasureType()); ResetWeightMeasureType.install(ui, ui.getDefaultWeightMeasureType(), ui.getWeightMeasureType()); } ===================================== pom.xml ===================================== @@ -147,7 +147,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <toolkit.version>5.0.1</toolkit.version> + <toolkit.version>5.0.2-SNAPSHOT</toolkit.version> <lib.version.ognl>3.1.28</lib.version.ognl>  ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/SampleDataServiceLocalSupport.java ===================================== @@ -61,13 +61,14 @@ public abstract class SampleDataServiceLocalSupport<C extends ContainerChildDto, @Override public SaveResultDto save(M dto) { - boolean notPersisted = dto.isNotPersisted(); // this is a trick we always use id as parent id... Set parent = loadParentEntity(dto.getId()); E entity = loadFormEntity(parent); checkLastUpdateDate(entity, dto); - // use the real id + // use the real sample id dto.setId(entity.getTopiaId()); + // not persisted is to be on sample (not set) + boolean notPersisted = dto.isNotPersisted(); entity.fromDto(getReferentialLocale(), dto); return onSave(parent, entity, notPersisted); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/49eaddefb1c4fa56d32b591e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/49eaddefb1c4fa56d32b591e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Let's add release maven module any time, this simplify the main build (no more...
by Tony CHEMIT 07 Feb '21

07 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 49eaddef by Tony Chemit at 2021-02-07T19:51:05+01:00 Let's add release maven module any time, this simplify the main build (no more extra configuration for release, or any other extra builds) - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -113,6 +113,7 @@ <module>services</module> <module>server</module> <module>client</module> + <module>observe</module> </modules> <scm> @@ -563,9 +564,6 @@ <value>true</value> </property> </activation> - <modules> - <module>observe</module> - </modules> <properties> <devMode>false</devMode> </properties> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/49eaddefb1c4fa56d32b591ef… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/49eaddefb1c4fa56d32b591ef… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Fix release 8.0.5
by Tony CHEMIT 07 Feb '21

07 Feb '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5b1a3e3d by Tony Chemit at 2021-02-07T19:39:14+01:00 Fix release 8.0.5 - - - - - 2b9201dd by Tony Chemit at 2021-02-07T19:40:49+01:00 [jgitflow-maven-plugin]updating poms for 8.0.6-SNAPSHOT development[skip ci] - - - - - cec6fdea by Tony Chemit at 2021-02-07T19:40:49+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 02b4b063 by Tony Chemit at 2021-02-07T19:40:49+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/dto/definition/pom.xml - models/dto/java/pom.xml - models/dto/pom.xml - models/persistence/definition/pom.xml - models/persistence/java/pom.xml - models/persistence/migration/pom.xml - models/persistence/pom.xml - models/pom.xml - observe/pom.xml - pom.xml - server/configuration/pom.xml - server/core/pom.xml - server/i18n/pom.xml - server/pom.xml - server/runner/pom.xml - services/api-test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/54bbdb0c338298dbc070d91e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/54bbdb0c338298dbc070d91e… You're receiving this email because of your account on gitlab.com.

1 0