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

[Git][ultreiaio/ird-observe][develop] Valider tous les écrans du modèle LL - See #1665
by Tony CHEMIT 06 Jan '21

06 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0c01dd99 by Tony Chemit at 2021-01-06T20:39:13+01:00 Valider tous les écrans du modèle LL - See #1665 Fix ContentTable - first table entry is not selected if in reading mode - - - - - 2 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentEditExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIOpenExecutor.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentEditExecutor.java ===================================== @@ -42,6 +42,7 @@ public interface ContentEditExecutor<U extends ContentUI> { if (mode != null) { switch (mode) { case READ: + doRead(ui); break; case CREATE: case UPDATE: @@ -50,4 +51,8 @@ public interface ContentEditExecutor<U extends ContentUI> { } } } + + default void doRead(U ui) { + // do nothing + } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIOpenExecutor.java ===================================== @@ -145,4 +145,10 @@ public class ContentTableUIOpenExecutor<D extends DataDto, C extends DataDto, U } } } + + @Override + public void doRead(U ui) { + // select first row + ui.getHandler().reselectRow(); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0c01dd99440f068d4fa0aabac… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0c01dd99440f068d4fa0aabac… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Happy new year commit!
by Tony CHEMIT 06 Jan '21

06 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 36a35df1 by Tony Chemit at 2021-01-06T19:51:07+01:00 Happy new year commit! - - - - - 30 changed files: - client/configuration/pom.xml - client/configuration/src/main/filtered-resources/observe-application.properties - client/configuration/src/main/i18n/templates/about_en_GB.ftl - client/configuration/src/main/i18n/templates/about_es_ES.ftl - client/configuration/src/main/i18n/templates/about_fr_FR.ftl - client/configuration/src/main/java/fr/ird/observe/client/ClientConfigFinderInstance.java - client/configuration/src/main/java/fr/ird/observe/client/ObServeSwingSessionConfig.java - client/configuration/src/main/java/fr/ird/observe/client/ObserveClientResourceManager.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfigFinder.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfig.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfigBean.java - client/configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client/configuration/src/main/java/fr/ird/observe/client/constants/AcquisitionMode.java - client/configuration/src/main/java/fr/ird/observe/client/constants/CatchAcquisitionMode.java - client/configuration/src/main/java/fr/ird/observe/client/constants/ConnexionStatus.java - client/configuration/src/main/java/fr/ird/observe/client/constants/CreationMode.java - client/configuration/src/main/java/fr/ird/observe/client/constants/DbMode.java - client/configuration/src/main/java/fr/ird/observe/client/constants/ProgramObservation.java - client/configuration/src/main/java/fr/ird/observe/client/constants/ValidationModelMode.java - client/configuration/src/main/java/fr/ird/observe/client/datasource/dcp/FloatingObjectPresetsManager.java - client/configuration/src/main/resources/log4j2.xml - client/configuration/src/main/resources/observe-log4j2.xml - client/configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/core/pom.xml - client/core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl - client/core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client/core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl - client/core/src/main/i18n/templates/initStorage_en_GB.ftl - client/core/src/main/i18n/templates/initStorage_es_ES.ftl The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/36a35df1b83ad396bc9820942… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/36a35df1b83ad396bc9820942… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Fix some bad binding in jaxx :(
by Tony CHEMIT 06 Jan '21

06 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 75460181 by Tony Chemit at 2021-01-06T18:34:40+01:00 Fix some bad binding in jaxx :( - - - - - 16179a26 by Tony Chemit at 2021-01-06T18:38:41+01:00 Problème si on supprime l'unique commentaire d'une commentaire, ça ne fonctionne pas bien! - Closes #1725 - - - - - 8 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx - pom.xml Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUI.jaxx ===================================== @@ -25,6 +25,8 @@ <import> fr.ird.observe.dto.data.DataDto + + fr.ird.observe.client.datasource.validation.ObserveSwingValidator </import> <ContentEditUIModel id='model' genericType='D'/> @@ -34,6 +36,9 @@ @Override public abstract ContentEditUIHandler<D, U> getHandler(); + @Override + public abstract ObserveSwingValidator<D> getValidator(); + @Override public void resetEdit() { getHandler().getResetAction().doReset(); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUI.jaxx ===================================== @@ -25,6 +25,7 @@ <import> fr.ird.observe.dto.data.DataDto + fr.ird.observe.client.datasource.validation.ObserveSwingValidator </import> <ContentOpenableUIModel id='model' genericType='D'/> @@ -35,6 +36,9 @@ @Override public abstract ContentOpenableUIHandler<D, U> getHandler(); + @Override + public abstract ObserveSwingValidator<D> getValidator(); + @Override public void resetEdit() { getHandler().getResetAction().doReset(); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUI.jaxx ===================================== @@ -25,6 +25,7 @@ <import> fr.ird.observe.dto.data.DataDto + fr.ird.observe.client.datasource.validation.ObserveSwingValidator </import> <ContentSimpleUIModel id='model' genericType='D'/> @@ -35,6 +36,9 @@ @Override public abstract ContentSimpleUIHandler<D, U> getHandler(); + @Override + public abstract ObserveSwingValidator<D> getValidator(); + @Override public void resetEdit() { getHandler().getResetAction().doReset(); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jaxx ===================================== @@ -46,8 +46,7 @@ <DataDto id='tableEditBean' initializer='getStates().getTableEditBean()'/>  - <ListSelectionModel id='selectionModel' initializer='getTableModel().getSelectionModel()' - onValueChanged='getHandler().updateEditor(event)'/> + <ListSelectionModel id='selectionModel' initializer='getTableModel().getSelectionModel()' onValueChanged='getHandler().updateEditor(event)'/>  <ContentTableEditorLayerUI id='editorBlockLayerUI' constructorParams="this" styleClass="blockBlockLayerUI"/> @@ -57,6 +56,9 @@ @Override public abstract ContentTableUIHandler<D, C, U> getHandler(); +@Override +public abstract ObserveSwingValidator<D> getValidator(); + public abstract SwingValidator<C> getValidatorTable(); @Override ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUI.jaxx ===================================== @@ -60,6 +60,9 @@ public abstract NormalTextEditor getUri(); @Override public abstract ContentReferentialUIHandler<D, R, U> getHandler(); +@Override +public abstract ObserveSwingValidator<D> getValidator(); + @Override public void resetEdit() { getHandler().getResetAction().doReset(); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUI.jaxx ===================================== @@ -45,6 +45,12 @@ static io.ultreia.java4all.i18n.I18n.n </import> + <script><![CDATA[ + @Override + public ObserveSwingValidator<LandingDto> getValidator() { + return getParentUI().getValidator(); + } +]]></script> <LandingPartUIModel id='model' initializer="getContextValue(LandingPartUIModel.class)"/> <LandingPartUITableModel id='tableModel' initializer="getContextValue(LandingPartUITableModel.class)"/> <LandingDto id='bean'/> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx ===================================== @@ -47,6 +47,12 @@ static io.ultreia.java4all.i18n.I18n.n </import> + <script><![CDATA[ + @Override + public ObserveSwingValidator<SampleDto> getValidator() { + return getParentUI().getValidator(); + } +]]></script> <SamplePartUIModel id='model' initializer="getContextValue(SamplePartUIModel.class)"/> <ContentTableUIModelStates id='states' genericType='SampleDto, SamplePartDto'/> <SamplePartUITableModel id='tableModel' initializer="getContextValue(SamplePartUITableModel.class)"/> ===================================== pom.xml ===================================== @@ -155,7 +155,7 @@   - <lib.version.java4all.jaxx>3.0-alpha-88</lib.version.java4all.jaxx> + <lib.version.java4all.jaxx>3.0-alpha-89-SNAPSHOT</lib.version.java4all.jaxx>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4aac1786a41449b6c15c0130… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4aac1786a41449b6c15c0130… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Bouton 'infos techniques' sur formulaire captures - Closes #1732
by Tony CHEMIT 06 Jan '21

06 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4aac1786 by Tony Chemit at 2021-01-06T17:14:52+01:00 Bouton 'infos techniques' sur formulaire captures - Closes #1732 - - - - - 7 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ShowTechnicalInformations.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModel.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModel.java ===================================== @@ -107,10 +107,6 @@ public abstract class ContentUIModel extends AbstractJavaBean implements Closeab states.setFormFocusOwner(formFocusOwner); } - public void setCanShowTechnicalInformation(boolean canShowTechnicalInformation) { - states.setCanShowTechnicalInformation(canShowTechnicalInformation); - } - public String getPrefix() { return getSource().getInitializer().getLogPrefix(); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java ===================================== @@ -54,7 +54,6 @@ public class ContentUIModelStates extends AbstractJavaBean implements Closeable public static final String PROPERTY_UPDATING_MODE = "updatingMode"; public static final String PROPERTY_OPENED = "opened"; private static final String PROPERTY_ENABLED = "enabled"; - private static final String PROPERTY_CAN_SHOW_TECHNICAL_INFORMATION = "canShowTechnicalInformation"; /** * Mode of the content. */ @@ -87,10 +86,6 @@ public class ContentUIModelStates extends AbstractJavaBean implements Closeable * Is content opened? */ private boolean opened; - /** - * Is can show technical information? - */ - private boolean canShowTechnicalInformation; /** * Is a reset edit in progress? */ @@ -288,16 +283,6 @@ public class ContentUIModelStates extends AbstractJavaBean implements Closeable firePropertyChange(PROPERTY_FORM_FOCUS_OWNER, formFocusOwner); } - public boolean isCanShowTechnicalInformation() { - return canShowTechnicalInformation; - } - - public void setCanShowTechnicalInformation(boolean canShowTechnicalInformation) { - boolean oldValue = isCanShowTechnicalInformation(); - this.canShowTechnicalInformation = canShowTechnicalInformation; - firePropertyChange(PROPERTY_CAN_SHOW_TECHNICAL_INFORMATION, oldValue, canShowTechnicalInformation); - } - @Override public void close() { setOpened(false); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/id/ShowTechnicalInformations.java ===================================== @@ -32,6 +32,9 @@ import fr.ird.observe.client.datasource.editor.api.content.data.list.ContentList import fr.ird.observe.client.datasource.editor.api.content.data.list.ContentListUIModelStates; import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUI; import fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUIModelStates; +import fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI; +import fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUIModelStates; +import fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUITableModel; import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUI; import fr.ird.observe.client.datasource.editor.api.content.referential.ContentReferentialUIModelStates; import fr.ird.observe.dto.reference.ReferentialDtoReference; @@ -74,6 +77,15 @@ public class ShowTechnicalInformations<U extends ContentUI> extends ContentUIAct ShowTechnicalInformations.init(ui, ui.getShowTechnicalInformations(), action); } + public static <U extends ContentTableUI<?, ?, U>> void installAction(U ui) { + ShowIdRequest request = ui.getModel().getShowIdRequest(); + ShowTechnicalInformations<U> action = new ShowTechnicalInformations<>(request, new ShowIdExecutor(ui.getHandler().getDecoratorService(), ui.getToggleConfigure())); + ui.getTableModel().addPropertyChangeListener(ContentTableUITableModel.SELECTED_ROW_PROPERTY, evt -> request.reset()); + ui.getModel().getStates().addPropertyChangeListener(ContentTableUIModelStates.PROPERTY_CAN_SAVE_ROW, evt -> request.reset()); + ui.getModel().getStates().addPropertyChangeListener(ContentTableUIModelStates.PROPERTY_MODIFIED, evt -> request.reset()); + ShowTechnicalInformations.init(ui, ui.getShowTechnicalInformations(), action); + } + public static <U extends ContentListUI<?, ?, U>> void installAction(U ui) { ShowIdRequest request = ui.getModel().getShowIdRequest(); ShowTechnicalInformations<U> action = new ShowTechnicalInformations<>(request, new ShowIdExecutor(ui.getHandler().getDecoratorService(), ui.getToggleConfigure())); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jaxx ===================================== @@ -19,39 +19,40 @@ --> <fr.ird.observe.client.datasource.editor.api.content.ContentUI - abstract='true' - genericType='D extends DataDto, C extends DataDto, U extends ContentTableUI<D, C, U>' - implements="fr.ird.observe.client.datasource.editor.api.content.EditableContentUI<D>"> + abstract='true' + genericType='D extends DataDto, C extends DataDto, U extends ContentTableUI<D, C, U>' + implements="fr.ird.observe.client.datasource.editor.api.content.EditableContentUI<D>"> - <import> + <import> - fr.ird.observe.client.util.ObserveBlockingLayerUI - fr.ird.observe.client.datasource.validation.ObserveSwingValidator + fr.ird.observe.client.util.ObserveBlockingLayerUI + fr.ird.observe.client.datasource.validation.ObserveSwingValidator - org.nuiton.jaxx.validator.swing.SwingValidator - fr.ird.observe.dto.data.DataDto + org.nuiton.jaxx.validator.swing.SwingValidator + fr.ird.observe.dto.data.DataDto - java.awt.Dimension + java.awt.Dimension - javax.swing.UIManager + javax.swing.UIManager - static io.ultreia.java4all.i18n.I18n.n - static io.ultreia.java4all.i18n.I18n.t - </import> + static io.ultreia.java4all.i18n.I18n.n + static io.ultreia.java4all.i18n.I18n.t + </import> - <ContentTableUIModel id='model' genericType='D, C'/> - <ContentTableUIModelStates id='states' genericType='D, C'/> - <ContentTableUITableModel id='tableModel' genericType='D, C, U' initializer='null'/> - <DataDto id='bean' initializer='getStates().getBean()'/> - <DataDto id='tableEditBean' initializer='getStates().getTableEditBean()'/> + <ContentTableUIModel id='model' genericType='D, C'/> + <ContentTableUIModelStates id='states' genericType='D, C'/> + <ContentTableUITableModel id='tableModel' genericType='D, C, U' initializer='null'/> + <DataDto id='bean' initializer='getStates().getBean()'/> + <DataDto id='tableEditBean' initializer='getStates().getTableEditBean()'/> -  - <ListSelectionModel id='selectionModel' initializer='getTableModel().getSelectionModel()' onValueChanged='getHandler().updateEditor(event)'/> +  + <ListSelectionModel id='selectionModel' initializer='getTableModel().getSelectionModel()' + onValueChanged='getHandler().updateEditor(event)'/> -  - <ContentTableEditorLayerUI id='editorBlockLayerUI' constructorParams="this" styleClass="blockBlockLayerUI"/> +  + <ContentTableEditorLayerUI id='editorBlockLayerUI' constructorParams="this" styleClass="blockBlockLayerUI"/> - <script><![CDATA[ + <script><![CDATA[ @Override public abstract ContentTableUIHandler<D, C, U> getHandler(); @@ -64,94 +65,94 @@ public void resetEdit() { } ]]> - </script> - - <JPanel id="body" layout='{new BorderLayout()}'> - - <JPanel id='hideForm' layout='{new BorderLayout()}' constraints="BorderLayout.CENTER"> - <JLabel id='hideFormInformation'/> - </JPanel> - <JPanel id='emptyForm' layout='{new BorderLayout()}' constraints="BorderLayout.CENTER"> - <JLabel id='emptyFormInformation'/> - </JPanel> - - <Table id='showForm' insets="0" weightx="1" constraints="BorderLayout.CENTER"> - - <row weighty="0.3"> - <cell fill="both"> -  - <JScrollPane id='tableScrollPane' decorator="boxed"> - <JTable id='table'/> - </JScrollPane> - </cell> - </row> - <row> - <cell fill="both"> - -  - <Table id='editor' fill='both' insets='0' decorator='boxed'> - -  + </script> + + <JPanel id="body" layout='{new BorderLayout()}'> + + <JPanel id='hideForm' layout='{new BorderLayout()}' constraints="BorderLayout.CENTER"> + <JLabel id='hideFormInformation'/> + </JPanel> + <JPanel id='emptyForm' layout='{new BorderLayout()}' constraints="BorderLayout.CENTER"> + <JLabel id='emptyFormInformation'/> + </JPanel> + + <Table id='showForm' insets="0" weightx="1" constraints="BorderLayout.CENTER"> + + <row weighty="0.3"> + <cell fill="both"> +  + <JScrollPane id='tableScrollPane' decorator="boxed"> + <JTable id='table'/> + </JScrollPane> + </cell> + </row> <row> - <cell fill='both' weightx='1'> - <Table id='editorPanel' decorator='boxed'/> - </cell> + <cell fill="both"> + +  + <Table id='editor' fill='both' insets='0' decorator='boxed'> + +  + <row> + <cell fill='both' weightx='1'> + <Table id='editorPanel' decorator='boxed'/> + </cell> + </row> + +  + <row> + <cell> + <Table fill='both' id='editorActions'> + <row> + <cell weightx='1'> +  + <JButton id='resetEntry'/> + </cell> + <cell weightx='1'> + <JPanel layout="{new GridLayout(1,0)}"> +  + <JButton id='saveEntry'/> +  + <JButton id='saveAndNewEntry'/> + </JPanel> + </cell> + <cell weightx='1'> +  + <JButton id='deleteEntry'/> + </cell> + </row> + </Table> + </cell> + </row> + </Table> + </cell> </row> - -  <row> - <cell> - <Table fill='both' id='editorActions'> - <row> - <cell weightx='1'> -  - <JButton id='resetEntry'/> - </cell> - <cell weightx='1'> - <JPanel layout="{new GridLayout(1,0)}"> -  - <JButton id='saveEntry'/> -  - <JButton id='saveAndNewEntry'/> - </JPanel> - </cell> - <cell weightx='1'> -  - <JButton id='deleteEntry'/> - </cell> - </row> - </Table> - </cell> + <cell fill="both"> + <Table id='extraZone' decorator='boxed'/> + </cell> </row> - </Table> - </cell> - </row> - <row> - <cell fill="both"> - <Table id='extraZone' decorator='boxed'/> - </cell> - </row> + </Table> + </JPanel> +  + <Table id="actions" weightx='1' insets='0' fill="both"> + <row fill="both"> + <cell weightx="0.5"> + <JButton id='reset'/> + </cell> + <cell weightx="0.5"> + <JButton id='save'/> + </cell> + </row> </Table> - </JPanel> -  - <Table id="actions" weightx='1' insets='0' fill="both"> - <row fill="both"> - <cell weightx="0.5"> - <JButton id='reset'/> - </cell> - <cell weightx="0.5"> - <JButton id='save'/> - </cell> - </row> - </Table> - <JPanel id="invisible"> -  - <JToolBar id="selectToolbar"> - <JButton id="selectFirstTableEntry"/> - <JButton id="selectPreviousTableEntry"/> - <JButton id="selectNextTableEntry"/> - <JButton id="selectLastTableEntry"/> - </JToolBar> - </JPanel> - + <JPanel id="invisible"> +  + <JToolBar id="selectToolbar"> + <JButton id="selectFirstTableEntry"/> + <JButton id="selectPreviousTableEntry"/> + <JButton id="selectNextTableEntry"/> + <JButton id="selectLastTableEntry"/> + </JToolBar> + </JPanel> + <JMenuItem id='showTechnicalInformations'/> </fr.ird.observe.client.datasource.editor.api.content.ContentUI> ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUI.jcss ===================================== @@ -112,3 +112,7 @@ verticalAlignment:"center"; horizontalAlignment:"center"; } + +#showTechnicalInformations { + enabled:{!states.isCreatingMode() && !tableModel.isCreate() && tableModel.getSelectedRow() > -1}; +} ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.client.datasource.editor.api.content.ContentMode; import fr.ird.observe.client.datasource.editor.api.content.ContentUIHandler; import fr.ird.observe.client.datasource.editor.api.content.actions.InsertMenuAction; import fr.ird.observe.client.datasource.editor.api.content.actions.create.CreateNewContentTableUIEntry; +import fr.ird.observe.client.datasource.editor.api.content.actions.id.ShowTechnicalInformations; import fr.ird.observe.client.datasource.editor.api.content.actions.mode.ChangeMode; import fr.ird.observe.client.datasource.editor.api.content.actions.mode.ChangeModeExecutor; import fr.ird.observe.client.datasource.editor.api.content.actions.mode.ChangeModeProducer; @@ -132,7 +133,7 @@ public abstract class ContentTableUIHandler<D extends DataDto, C extends DataDto ResetEntry.init(ui, ui.getResetEntry(), ResetEntry.class); SaveAndNewEntry.init(ui, ui.getSaveAndNewEntry(), SaveAndNewEntry.class); DeleteEntry.init(ui, ui.getDeleteEntry(), DeleteEntry.class); - + ShowTechnicalInformations.installAction(ui); getComponent(JButton.class, "importData").ifPresent(e -> ImportDataFile.installAction(ui, e)); getComponent(JButton.class, "deleteData").ifPresent(e -> DeleteDataFile.installAction(ui, e)); getComponent(JButton.class, "exportData").ifPresent(e -> ExportDataFile.installAction(ui, e)); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModel.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data.table; import fr.ird.observe.client.datasource.editor.api.content.ContentUI; +import fr.ird.observe.client.datasource.editor.api.content.actions.id.ShowIdRequest; import fr.ird.observe.client.datasource.editor.api.content.actions.save.SaveRequest; import fr.ird.observe.client.datasource.editor.api.content.data.simple.ContentSimpleUIModelSupport; import fr.ird.observe.client.datasource.editor.api.content.data.table.sortable.SortableTableUI; @@ -29,6 +30,7 @@ import fr.ird.observe.client.datasource.editor.api.navigation.tree.NavigationNod import fr.ird.observe.client.util.init.DefaultUIInitializerResult; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.form.Form; +import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.services.service.data.SimpleDataService; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -174,4 +176,11 @@ public abstract class ContentTableUIModel<D extends DataDto, C extends DataDto> } return super.openForm(selectedId); } + + public ShowIdRequest getShowIdRequest() { + return new ShowIdRequest(() -> { + C tableEditBean = ContentTableUIModel.this.getStates().getTableEditBean(); + return tableEditBean == null ? null : DtoReference.toReference(getClientUIContext().getDecoratorService().getReferentialLocale(), tableEditBean); + }); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4aac1786a41449b6c15c0130a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4aac1786a41449b6c15c0130a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Consultation du tableau de captures - Closes #1731
by Tony CHEMIT 06 Jan '21

06 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a741dd77 by Tony Chemit at 2021-01-06T16:37:19+01:00 Consultation du tableau de captures - Closes #1731 Review ContentTable actions (before focus refactor) Review ContentUI actions scope (never be able to use them if not in content zone) - - - - - 30 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ContentUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ToggleConfigure.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeMode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java - − client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/MakeActionsEnabledOnlyIfMenuItemParentIsOpenedPopupMenuListener.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/DeleteDataFile.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/datafile/DeleteDataFile.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/ExportDataFile.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/datafile/ExportDataFile.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/ImportDataFile.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/datafile/ImportDataFile.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/WithDataFileActionSupport.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/datafile/WithDataFileActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/ContentTableUIEntryActionSupport.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/ContentTableUIEntryActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/DeleteEntry.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/DeleteEntry.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/ResetEntry.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/ResetEntry.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SaveAndNewEntry.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/SaveAndNewEntry.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SaveTableEntry.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/SaveTableEntry.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/MoveBottom.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveBottom.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/MoveDown.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveDown.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/MoveTop.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveTop.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/MoveUp.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/move/MoveUp.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SelectFirst.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/select/SelectFirst.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SelectLast.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/select/SelectLast.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SelectNext.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/select/SelectNext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/SelectPrevious.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/select/SelectPrevious.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/AddNewRow.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/inline/AddNewRow.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/DeleteSelectedRow.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/inline/DeleteSelectedRow.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/popup/InlineTableAutoSelectRowAndShowPopupAction.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/inline/InlineTableAutoSelectRowAndShowPopupAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/ResetSizeMeasureType.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/sample/ResetSizeMeasureType.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a741dd7757d28c63a49144760… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a741dd7757d28c63a49144760… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Valider tous les écrans du modèle LL - See #1665
by Tony CHEMIT 06 Jan '21

06 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ce3b613b by Tony Chemit at 2021-01-06T11:35:22+01:00 Valider tous les écrans du modèle LL - See #1665 Problème de restitution de la position sur la ligne LL-Observation-Catch/Tdr - - - - - 46bd55b1 by Tony Chemit at 2021-01-06T11:41:34+01:00 Peaufinage de la table ll_common.onboardprocessing 2 - Closes #1735 - - - - - 10 changed files: - models/persistence/src/main/java/fr/ird/observe/entities/data/ll/observation/SetImpl.java - models/persistence/src/main/resources/db/migration/8.0/60_ll_common_fill-common.sql - models/persistence/src/test/resources/fixtures/persistence/count-referential-longline.properties - models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties - tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz - tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz - tests/test/src/main/resources/db/8.0/empty_h2.sql.gz - tests/test/src/main/resources/db/8.0/empty_pg.sql.gz - tests/test/src/main/resources/db/8.0/referentiel.sql.gz - tests/test/src/main/resources/fixtures/global.properties Changes: ===================================== models/persistence/src/main/java/fr/ird/observe/entities/data/ll/observation/SetImpl.java ===================================== @@ -25,12 +25,15 @@ package fr.ird.observe.entities.data.ll.observation; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.data.ll.observation.BasketReference; import fr.ird.observe.dto.data.ll.observation.BranchlineReference; +import fr.ird.observe.dto.data.ll.observation.LonglinePositionAware; import fr.ird.observe.dto.data.ll.observation.LonglinePositionContainerAware; import fr.ird.observe.dto.data.ll.observation.SectionReference; import fr.ird.observe.dto.referential.ReferentialLocale; +import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; +import java.util.Map; public class SetImpl extends SetAbstract { @@ -48,6 +51,8 @@ public class SetImpl extends SetAbstract { private void loadDtoReferenceParents(LonglinePositionContainerAware dto, ReferentialLocale referentialLocale) { List<SectionReference> sections = new LinkedList<>(); List<BasketReference> baskets = new LinkedList<>(); + Map<String, BasketReference> basketsParents = new LinkedHashMap<>(); + Map<String, BranchlineReference> branchlinesParents = new LinkedHashMap<>(); List<BranchlineReference> branchlines = new LinkedList<>(); getSection().forEach(section -> { section.setParentId(getTopiaId()); @@ -59,15 +64,31 @@ public class SetImpl extends SetAbstract { basket.setParentId(sectionId); BasketReference basketReference = basket.toReference(referentialLocale); baskets.add(basketReference); + basketsParents.put(basketId, basketReference); basket.getBranchline().forEach(branchline -> { branchline.setParentId(basketId); BranchlineReference branchlineReference = branchline.toReference(referentialLocale); branchlines.add(branchlineReference); + branchlinesParents.put(branchline.getTopiaId(), branchlineReference); }); }); }); dto.setSections(sections); dto.setBaskets(baskets); dto.setBranchlines(branchlines); + for (LonglinePositionAware datum : dto.getData()) { + BranchlineReference branchline = datum.getBranchline(); + if (branchline != null) { + BranchlineReference branchlineWithParentId = branchlinesParents.get(branchline.getId()); + datum.setBranchline(branchlineWithParentId); + } else { + BasketReference basket = datum.getBasket(); + if (basket != null) { + BasketReference basketWithParentId = basketsParents.get(basket.getId()); + datum.setBasket(basketWithParentId); + } + } + } + } } ===================================== models/persistence/src/main/resources/db/migration/8.0/60_ll_common_fill-common.sql ===================================== @@ -71,8 +71,7 @@ INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.22', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'FILLET', 1, false, null, 'Filleted', 'Filet', 'Filleted #TODO', null, null, null, null, null, null); INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.23', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'GIL', 1, false, null, 'Gilled', 'Sans branchies', 'Gilled #TODO', null, null, null, null, null, null); INSERT INTO ll_common.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1609847952719#0.41927756421927587', 1, '2021-01-05 11:57:13.019', '2021-01-05 11:59:12.746', 'SALT', null, null, FALSE, 1, 'Salted', 'Salé', 'Salado', null, null, null, null, null); -INSERT INTO ll_common.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1609848016239#0.8310203513100917', 1, '2021-01-05 11:59:25.268', '2021-01-05 12:00:16.241', 'LIVE', null, null, FALSE, 1, 'Kept alive', 'Gardé vivant', 'Mantenido vivo', null, null, null, null, null); -INSERT INTO ll_common.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1609848457257#0.12756593660166082', 1, '2021-01-05 12:00:19.234', '2021-01-05 12:07:37.259', 'DEAD', null, null, FALSE, 1, 'Kept dead', 'Conservé mort', 'Mantenido muerto', null, null, null, null, null); + INSERT INTO ll_common.linetype (topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.LineType#1239832686157#0.9', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'UNK', 'Unknown', 'Inconnu', 'Desconocido'); UPDATE ll_common.trip SET observationsAvailability = TRUE; ===================================== models/persistence/src/test/resources/fixtures/persistence/count-referential-longline.properties ===================================== @@ -47,6 +47,6 @@ ll_common.weightcategory=0 ll_landing.company=30 ll_landing.datasource=20 ll_common.triptype=2 -ll_common.onboardprocessing=16 +ll_common.onboardprocessing=14 ll_landing.conservation=3 ll_common.weightdeterminationmethod=0 ===================================== models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties ===================================== @@ -57,7 +57,7 @@ fr.ird.observe.entities.referential.ll.common.LightsticksType=2 fr.ird.observe.entities.referential.ll.common.LineType=9 fr.ird.observe.entities.referential.ll.common.MitigationType=15 fr.ird.observe.entities.referential.ll.common.ObservationMethod=2 -fr.ird.observe.entities.referential.ll.common.OnBoardProcessing=16 +fr.ird.observe.entities.referential.ll.common.OnBoardProcessing=14 fr.ird.observe.entities.referential.ll.common.SettingShape=6 fr.ird.observe.entities.referential.ll.common.TripType=2 fr.ird.observe.entities.referential.ll.common.VesselActivity=27 ===================================== tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/empty_h2.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/empty_h2.sql.gz and b/tests/test/src/main/resources/db/8.0/empty_h2.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/empty_pg.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/empty_pg.sql.gz and b/tests/test/src/main/resources/db/8.0/empty_pg.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/referentiel.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/referentiel.sql.gz and b/tests/test/src/main/resources/db/8.0/referentiel.sql.gz differ ===================================== tests/test/src/main/resources/fixtures/global.properties ===================================== @@ -35,5 +35,5 @@ SPECIES_GROUP_ID=fr.ird.referential.common.SpeciesGroup#1239832683689#0.71201161 # for fr.ird.observe.spi.DbModelHelperTest REFERENCE_DATA_COUNT=53 # for fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest -REFERENTIAL_COUNT=3034 +REFERENTIAL_COUNT=3032 ENTITIES_LIMIT_SIZE=100 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/95738c1218839ce135799e34… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/95738c1218839ce135799e34… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Peaufinage de la table ll_common.onboardprocessing - Closes #1733
by Tony CHEMIT 05 Jan '21

05 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f661eff4 by Tony Chemit at 2021-01-05T13:58:42+01:00 Peaufinage de la table ll_common.onboardprocessing - Closes #1733 - - - - - 95738c12 by Tony Chemit at 2021-01-05T14:00:16+01:00 Gestion du champ 'numéro au virage' - Closes #1729 Erreur sur validateur 'numéro au virage' - Closes #1730 - - - - - 10 changed files: - models/persistence/src/main/resources/db/migration/8.0/60_ll_common_fill-common.sql - models/persistence/src/test/resources/fixtures/persistence/count-referential-longline.properties - models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties - pom.xml - tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz - tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz - tests/test/src/main/resources/db/8.0/empty_h2.sql.gz - tests/test/src/main/resources/db/8.0/empty_pg.sql.gz - tests/test/src/main/resources/db/8.0/referentiel.sql.gz - tests/test/src/main/resources/fixtures/global.properties Changes: ===================================== models/persistence/src/main/resources/db/migration/8.0/60_ll_common_fill-common.sql ===================================== @@ -62,15 +62,17 @@ INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.3' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'HG', 'Headed and gutted', 'Etêté et vidé', 'Etêté et vidé #TODO'); INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.4' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'GG', 'Gilled and gutted', 'Vidé et sans branchies', 'Vidé et sans branchies #TODO'); INSERT INTO ll_common.OnBoardProcessing(topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.5' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'L', 'Loins', 'Longes', 'Longes #TODO'); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.16', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'UNK', 1, 'f', null, 'Unknown', 'Inconnu', 'Unknown #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.17', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'GUT', 1, 'f', null, 'Gutted', 'Vidé', 'Gutted #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.18', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'FIN', 1, 'f', null, 'Finned', 'Aileron coupé', 'Finned #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.19', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'SUMMEAT', 1, 'f', null, 'Total Meat Retained for all species', 'Chair conservée pour toutes les espèces', 'Total Meat Retained for all species #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.20', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'DOGFD', 1, 'f', null, 'Fish used for animal feed', 'Alimentation pour animal', 'Fish used for animal feed #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.21', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'DR', 1, 'f', null, 'Dried', 'Séché', 'Dried #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.22', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'FILLET', 1, 'f', null, 'Filleted', 'Filet', 'Filleted #TODO', null, null, null, null, null, null); -INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.23', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'GIL', 1, 'f', null, 'Gilled', 'Sans branchies', 'Gilled #TODO', null, null, null, null, null, null); - +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid)VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.16', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'UNK', 1, false, null, 'Unknown', 'Inconnu', 'Unknown #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.17', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'GUT', 1, false, null, 'Gutted', 'Vidé', 'Gutted #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.18', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'FIN', 1, false, null, 'Finned', 'Aileron coupé', 'Finned #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.19', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'SUMMEAT', 1, false, null, 'Total Meat Retained for all species', 'Chair conservée pour toutes les espèces', 'Total Meat Retained for all species #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.20', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'DOGFD', 1, false, null, 'Fish used for animal feed', 'Alimentation pour animal', 'Fish used for animal feed #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.21', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'DR', 1, false, null, 'Dried', 'Séché', 'Dried #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.22', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'FILLET', 1, false, null, 'Filleted', 'Filet', 'Filleted #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.onboardprocessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, needcomment, uri, label1, label2, label3, label4, label5, label6, label7, label8, homeid) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1464000000000#0.23', 1, '2020-10-21 00:00:00', '2020-10-21 00:00:00', 'GIL', 1, false, null, 'Gilled', 'Sans branchies', 'Gilled #TODO', null, null, null, null, null, null); +INSERT INTO ll_common.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1609847952719#0.41927756421927587', 1, '2021-01-05 11:57:13.019', '2021-01-05 11:59:12.746', 'SALT', null, null, FALSE, 1, 'Salted', 'Salé', 'Salado', null, null, null, null, null); +INSERT INTO ll_common.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1609848016239#0.8310203513100917', 1, '2021-01-05 11:59:25.268', '2021-01-05 12:00:16.241', 'LIVE', null, null, FALSE, 1, 'Kept alive', 'Gardé vivant', 'Mantenido vivo', null, null, null, null, null); +INSERT INTO ll_common.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.ll.common.OnBoardProcessing#1609848457257#0.12756593660166082', 1, '2021-01-05 12:00:19.234', '2021-01-05 12:07:37.259', 'DEAD', null, null, FALSE, 1, 'Kept dead', 'Conservé mort', 'Mantenido muerto', null, null, null, null, null); INSERT INTO ll_common.linetype (topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, status, needComment, code, label1, label2, label3) values ('fr.ird.referential.ll.common.LineType#1239832686157#0.9', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'UNK', 'Unknown', 'Inconnu', 'Desconocido'); UPDATE ll_common.trip SET observationsAvailability = TRUE; ===================================== models/persistence/src/test/resources/fixtures/persistence/count-referential-longline.properties ===================================== @@ -47,6 +47,6 @@ ll_common.weightcategory=0 ll_landing.company=30 ll_landing.datasource=20 ll_common.triptype=2 -ll_common.onboardprocessing=13 +ll_common.onboardprocessing=16 ll_landing.conservation=3 ll_common.weightdeterminationmethod=0 ===================================== models/persistence/src/test/resources/fixtures/persistence/entity-tables-count-referential.properties ===================================== @@ -57,7 +57,7 @@ fr.ird.observe.entities.referential.ll.common.LightsticksType=2 fr.ird.observe.entities.referential.ll.common.LineType=9 fr.ird.observe.entities.referential.ll.common.MitigationType=15 fr.ird.observe.entities.referential.ll.common.ObservationMethod=2 -fr.ird.observe.entities.referential.ll.common.OnBoardProcessing=13 +fr.ird.observe.entities.referential.ll.common.OnBoardProcessing=16 fr.ird.observe.entities.referential.ll.common.SettingShape=6 fr.ird.observe.entities.referential.ll.common.TripType=2 fr.ird.observe.entities.referential.ll.common.VesselActivity=27 ===================================== pom.xml ===================================== @@ -155,7 +155,7 @@   -  + <lib.version.java4all.jaxx>3.0-alpha-88</lib.version.java4all.jaxx>    ===================================== tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz and b/tests/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/empty_h2.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/empty_h2.sql.gz and b/tests/test/src/main/resources/db/8.0/empty_h2.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/empty_pg.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/empty_pg.sql.gz and b/tests/test/src/main/resources/db/8.0/empty_pg.sql.gz differ ===================================== tests/test/src/main/resources/db/8.0/referentiel.sql.gz ===================================== Binary files a/tests/test/src/main/resources/db/8.0/referentiel.sql.gz and b/tests/test/src/main/resources/db/8.0/referentiel.sql.gz differ ===================================== tests/test/src/main/resources/fixtures/global.properties ===================================== @@ -35,5 +35,5 @@ SPECIES_GROUP_ID=fr.ird.referential.common.SpeciesGroup#1239832683689#0.71201161 # for fr.ird.observe.spi.DbModelHelperTest REFERENCE_DATA_COUNT=53 # for fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest -REFERENTIAL_COUNT=3031 +REFERENTIAL_COUNT=3034 ENTITIES_LIMIT_SIZE=100 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5cc43cee176f684d39c56877… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5cc43cee176f684d39c56877… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Add toIds method
by Tony CHEMIT 05 Jan '21

05 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9110ae3d by Tony Chemit at 2021-01-05T12:13:20+01:00 Add toIds method - - - - - c99808ed by Tony Chemit at 2021-01-05T12:14:39+01:00 Introduce LazyDataDtoReferenceSet, at last, works perfectly. - - - - - a41f5bd6 by Tony Chemit at 2021-01-05T12:15:59+01:00 Extends referenceService to get a set of reference at a time - - - - - 45fb171a by Tony Chemit at 2021-01-05T12:17:03+01:00 Améliorer les performances lors du changement de l'arbre de navigation - See #1709 Use specialized dao methods to get navigation result - - - - - e7bf5f3c by Tony Chemit at 2021-01-05T12:20:52+01:00 Améliorer les performances lors du changement de l'arbre de navigation - See #1709 Simplify dto model and make it compliant with next ui generation - - - - - a6d677f0 by Tony Chemit at 2021-01-05T12:21:39+01:00 Améliorer les performances lors du changement de l'arbre de navigation - See #1709 Review Service API (now getting only trip ids), let the navigation tree load what it needs from this to avoid loading all trip nodes... - - - - - 5cc43cee by Tony Chemit at 2021-01-05T13:01:54+01:00 Améliorer les performances lors du changement de l'arbre de navigation - See #1709 Adapt ui to use auto-loading data sets. - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/DataSourceReferenceProvider.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationContext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/RootSelectionTreeNodeProvider.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/SelectionTreeModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/nodes/RootSelectionTreeNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationTreeModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/actions/GoDown.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationContext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationScope.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationCapability.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/root/RootNavigationTreeNodeProvider.java - client/datasource/editor/common/pom.xml - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/CommonRootSelectionTreeNodeProvider.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/LlRootNavigationTreeNodeProvider.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/LlRootSelectionTreeNodeProvider.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/PsRootNavigationTreeNodeProvider.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/PsRootSelectionTreeNodeProvider.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/CapabilityDescriptor.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/edit/GenerateContentEditUINavigationNode.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/list/GenerateContentListUINavigationNode.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/openable/GenerateContentOpenableUINavigationNode.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/simple/GenerateContentSimpleUINavigationNode.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/table/GenerateContentTableUINavigationNode.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/helper/ContentUINavigationContextHelper.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/89d60b7757d97c18e4817fd0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/89d60b7757d97c18e4817fd0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Erreur sur création de marée LL - Closes #1728
by Tony CHEMIT 04 Jan '21

04 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 89d60b77 by Tony Chemit at 2021-01-04T13:35:04+01:00 Erreur sur création de marée LL - Closes #1728 - - - - - 1 changed file: - models/persistence/src/main/java/fr/ird/observe/entities/data/ll/common/TripImpl.java Changes: ===================================== models/persistence/src/main/java/fr/ird/observe/entities/data/ll/common/TripImpl.java ===================================== @@ -52,20 +52,24 @@ public class TripImpl extends TripAbstract { int logbookFishingOperationCount = 0; int associatedActivityCount = 0; int associatedFishingOperationCount = 0; - for (fr.ird.observe.entities.data.ll.observation.Activity a : getActivityObs()) { - if (a.isSetOperation()) { - observationsFishingOperationCount++; + if (isActivityObsNotEmpty()) { + for (fr.ird.observe.entities.data.ll.observation.Activity a : getActivityObs()) { + if (a.isSetOperation()) { + observationsFishingOperationCount++; + } } } - for (fr.ird.observe.entities.data.ll.logbook.Activity a : getActivityLogbook()) { - boolean withRelated = a.getRelatedObservedActivity() != null; - if (withRelated) { - associatedActivityCount++; - } - if (a.isSetOperation()) { - logbookFishingOperationCount++; + if (isActivityLogbookNotEmpty()) { + for (fr.ird.observe.entities.data.ll.logbook.Activity a : getActivityLogbook()) { + boolean withRelated = a.getRelatedObservedActivity() != null; if (withRelated) { - associatedFishingOperationCount++; + associatedActivityCount++; + } + if (a.isSetOperation()) { + logbookFishingOperationCount++; + if (withRelated) { + associatedFishingOperationCount++; + } } } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/89d60b7757d97c18e4817fd09… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/89d60b7757d97c18e4817fd09… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] LL Logbook capture : validation formulaire - Closes #1727
by Tony CHEMIT 04 Jan '21

04 Jan '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2aecae7e by Tony Chemit at 2021-01-04T12:14:57+01:00 LL Logbook capture : validation formulaire - Closes #1727 - - - - - 7 changed files: - services/i18n/src/main/i18n/translations/services_en_GB.properties - services/i18n/src/main/i18n/translations/services_es_ES.properties - services/i18n/src/main/i18n/translations/services_fr_FR.properties - services/validation/src/main/i18n/getters/validation-messages.getter - services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/CatchDto-update-error-validation.xml - + services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/CatchDto-update-warning-validation.xml - services/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/CatchDto-update-error-validation.xml Changes: ===================================== services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -158,7 +158,6 @@ observe.data.ll.Activity.validation.endDate.before.currentTrip.endDate=End date observe.data.ll.Activity.validation.endTime.after.startTime=End time must be after start time observe.data.ll.Activity.validation.startDate.after.currentTrip.startDate=Start date must be after current trip start date observe.data.ll.Activity.validation.startDate.before.currentTrip.endDate=Start date must be before current trip end date -observe.data.ll.Catch.validation.required.count.when.acquisitionModeIsGrouped=Count must be filled in group mode. observe.data.ll.Set.validation.baitsComposition.uniqueKey=Tuple (type/status/size/weight) must be unique. observe.data.ll.Set.validation.branchlinesComposition.uniqueKey=Tuple (topType/type/size) must be unique. observe.data.ll.Set.validation.duplicated.homeId=Home id is already used in another fishing operation (%1$s). @@ -241,6 +240,7 @@ observe.data.ll.logbook.Catch.predator=TODO observe.data.ll.logbook.Catch.speciesCatch=Species observe.data.ll.logbook.Catch.totalWeight=Total weight (kg) observe.data.ll.logbook.Catch.type=Catch +observe.data.ll.logbook.Catch.validation.required.countOrTotalWeight.when.acquisitionModeIsGrouped=Count or total weight must be filled in group mode. observe.data.ll.logbook.FloatlinesComposition.length=Length observe.data.ll.logbook.FloatlinesComposition.lineType=Line type observe.data.ll.logbook.FloatlinesComposition.proportion=Proportion @@ -360,6 +360,7 @@ observe.data.ll.observation.Catch.speciesCatch=Species observe.data.ll.observation.Catch.stomachFullness=Stomac fullness observe.data.ll.observation.Catch.totalWeight=Total weight (kg) observe.data.ll.observation.Catch.type=Catch +observe.data.ll.observation.Catch.validation.required.count.when.acquisitionModeIsGrouped=Count must be filled in group mode. observe.data.ll.observation.Encounter.count=Count observe.data.ll.observation.Encounter.distance=Distance (m) observe.data.ll.observation.Encounter.encounterType=Type ===================================== services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -158,7 +158,6 @@ observe.data.ll.Activity.validation.endDate.before.currentTrip.endDate=End date observe.data.ll.Activity.validation.endTime.after.startTime=End time must be after start time \#TODO observe.data.ll.Activity.validation.startDate.after.currentTrip.startDate=Start date must be after current trip start date \#TODO observe.data.ll.Activity.validation.startDate.before.currentTrip.endDate=Start date must be before current trip end date \#TODO -observe.data.ll.Catch.validation.required.count.when.acquisitionModeIsGrouped=El número es mandatorio en modo grupado. observe.data.ll.Set.validation.baitsComposition.uniqueKey=La tupla (type/estado/tamaño/peso) debe ser única, la tupa ya está utilizada. observe.data.ll.Set.validation.branchlinesComposition.uniqueKey=La tupla (tipo alto/tipo bajo/tamaño) debe ser única, la tupa ya está utilizada. observe.data.ll.Set.validation.duplicated.homeId=El Id de negocio ya está utilizado por una otra operación de pesca (%s) @@ -241,6 +240,7 @@ observe.data.ll.logbook.Catch.predator=TODO observe.data.ll.logbook.Catch.speciesCatch=Especie observe.data.ll.logbook.Catch.totalWeight=Peso total (kg) observe.data.ll.logbook.Catch.type=Captura +observe.data.ll.logbook.Catch.validation.required.countOrTotalWeight.when.acquisitionModeIsGrouped=El número or total weight es mandatorio en modo grupado. \#TODO observe.data.ll.logbook.FloatlinesComposition.length=Longitud (m) observe.data.ll.logbook.FloatlinesComposition.lineType=Tipo observe.data.ll.logbook.FloatlinesComposition.proportion=Proporción (%) @@ -360,6 +360,7 @@ observe.data.ll.observation.Catch.speciesCatch=Especie observe.data.ll.observation.Catch.stomachFullness=Estatuto del estomago observe.data.ll.observation.Catch.totalWeight=Peso total (kg) observe.data.ll.observation.Catch.type=Captura +observe.data.ll.observation.Catch.validation.required.count.when.acquisitionModeIsGrouped=El número es mandatorio en modo grupado. observe.data.ll.observation.Encounter.count=Numéro observe.data.ll.observation.Encounter.distance=Distancia (m) observe.data.ll.observation.Encounter.encounterType=Tipo del encuentro ===================================== services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -158,7 +158,6 @@ observe.data.ll.Activity.validation.endDate.before.currentTrip.endDate=La date d observe.data.ll.Activity.validation.endTime.after.startTime=L'heure de fin doit être supérieure ou égale à l'heure de début de l'activité observe.data.ll.Activity.validation.startDate.after.currentTrip.startDate=La date doit être supérieure ou égale à la date de début de marée observe.data.ll.Activity.validation.startDate.before.currentTrip.endDate=La date doit être inférieure ou égale à la date de fin de marée -observe.data.ll.Catch.validation.required.count.when.acquisitionModeIsGrouped=Le nombre est obligatoire en mode groupé. observe.data.ll.Set.validation.baitsComposition.uniqueKey=Le tuple (type/état/taille/poids) doit être unique, le tuple est déjà utilisé. observe.data.ll.Set.validation.branchlinesComposition.uniqueKey=Le tuple (type haut/type bas/taille) doit être unique observe.data.ll.Set.validation.duplicated.homeId=L'Id métier est déjà utilisé par une autre opération de pêche (%s) @@ -241,6 +240,7 @@ observe.data.ll.logbook.Catch.predator=TODO observe.data.ll.logbook.Catch.speciesCatch=Espèce observe.data.ll.logbook.Catch.totalWeight=Poids total (kg) observe.data.ll.logbook.Catch.type=Capture +observe.data.ll.logbook.Catch.validation.required.countOrTotalWeight.when.acquisitionModeIsGrouped=Le nombre ou le poids total est obligatoire en mode groupé. observe.data.ll.logbook.FloatlinesComposition.length=Longueur (m) observe.data.ll.logbook.FloatlinesComposition.lineType=Type observe.data.ll.logbook.FloatlinesComposition.proportion=Proportion (%) @@ -360,6 +360,7 @@ observe.data.ll.observation.Catch.speciesCatch=Espèce observe.data.ll.observation.Catch.stomachFullness=État de l'estomac observe.data.ll.observation.Catch.totalWeight=Poids total (kg) observe.data.ll.observation.Catch.type=Capture +observe.data.ll.observation.Catch.validation.required.count.when.acquisitionModeIsGrouped=Le nombre est obligatoire en mode groupé. observe.data.ll.observation.Encounter.count=Nombre observe.data.ll.observation.Encounter.distance=Distance (m) observe.data.ll.observation.Encounter.encounterType=Type de la rencontre ===================================== services/validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -29,7 +29,6 @@ observe.data.ll.Activity.validation.endDate.before.currentTrip.endDate observe.data.ll.Activity.validation.endTime.after.startTime observe.data.ll.Activity.validation.startDate.after.currentTrip.startDate observe.data.ll.Activity.validation.startDate.before.currentTrip.endDate -observe.data.ll.Catch.validation.required.count.when.acquisitionModeIsGrouped observe.data.ll.Set.validation.baitsComposition.uniqueKey observe.data.ll.Set.validation.branchlinesComposition.uniqueKey observe.data.ll.Set.validation.duplicated.homeId @@ -42,6 +41,7 @@ observe.data.ll.Set.validation.settingStartTimeStamp.before.settingEndTimeStamp observe.data.ll.landing.Landing.validation.endDate.after.startDate observe.data.ll.landing.LandingPart.validation.bound.categoryWeight observe.data.ll.landing.LandingPart.validation.required.weightMeasureMethod +observe.data.ll.logbook.Catch.validation.required.countOrTotalWeight.when.acquisitionModeIsGrouped observe.data.ll.logbook.SamplePart.validation.required.sizeMeasureType.for.length observe.data.ll.logbook.SamplePart.validation.required.weightMeasureType.for.weight observe.data.ll.logbook.Set.validation.required.haulingEndLatitude @@ -50,6 +50,7 @@ observe.data.ll.logbook.Set.validation.required.haulingStartLatitude observe.data.ll.logbook.Set.validation.required.haulingStartLongitude observe.data.ll.logbook.Set.validation.required.settingEndLatitude observe.data.ll.logbook.Set.validation.required.settingEndLongitude +observe.data.ll.observation.Catch.validation.required.count.when.acquisitionModeIsGrouped observe.data.ll.observation.LonglinePositionAware.validation.required.position observe.data.ll.observation.SetDetailComposition.validation.invalid.templates observe.data.ll.observation.Tdr.validation.deploymentStart.before.fishingStart ===================================== services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/CatchDto-update-error-validation.xml ===================================== @@ -24,12 +24,17 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="count"> -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ acquisitionMode == 0 || count != null ]]> - </param> - <message>observe.data.ll.Catch.validation.required.count.when.acquisitionModeIsGrouped</message> +  + <field-validator type="mandatory" short-circuit="true"> + <param name="skip">acquisitionMode == 0 || totalWeight != null</param> + <message>observe.data.ll.logbook.Catch.validation.required.countOrTotalWeight.when.acquisitionModeIsGrouped</message> + </field-validator> + </field> + <field name="totalWeight"> +  + <field-validator type="mandatory" short-circuit="true"> + <param name="skip">acquisitionMode == 0 || count != null</param> + <message>observe.data.ll.logbook.Catch.validation.required.countOrTotalWeight.when.acquisitionModeIsGrouped</message> </field-validator> </field> <field name="depredatedProportion"> ===================================== services/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/CatchDto-update-warning-validation.xml ===================================== @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE validators PUBLIC + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> +<validators> + <field name="count"> + <field-validator type="notFilled" short-circuit="true"> + <param name="skip">acquisitionMode == 0 || totalWeight == null</param> + <message/> + </field-validator> + </field> + <field name="totalWeight"> + <field-validator type="notFilled" short-circuit="true"> + <param name="skip">acquisitionMode == 0 || count == null</param> + <message/> + </field-validator> + </field> + <field name="depredatedProportion"> + <field-validator type="boundNumber" short-circuit="true"> + <param name="min">1.0</param> + <param name="max">100.0</param> + <message/> + </field-validator> + </field> +</validators> ===================================== services/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/CatchDto-update-error-validation.xml ===================================== @@ -25,11 +25,9 @@ <validators> <field name="count">  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ acquisitionMode == 0 || count != null ]]> - </param> - <message>observe.data.ll.Catch.validation.required.count.when.acquisitionModeIsGrouped</message> + <field-validator type="mandatory" short-circuit="true"> + <param name="skip">acquisitionMode == 0</param> + <message>observe.data.ll.observation.Catch.validation.required.count.when.acquisitionModeIsGrouped</message> </field-validator> </field> <field name="gonadeWeight"> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2aecae7e8f2ae7dde1718be1e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2aecae7e8f2ae7dde1718be1e… You're receiving this email because of your account on gitlab.com.

1 0