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

[Git][ultreiaio/ird-observe][develop] Amélioration de la conservation du paramétrage des UI - Closes #2926
by Tony CHEMIT (＠tchemit) Aug. 29, 2024

Aug. 29, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3fcd8bd7 by Tony Chemit at 2024-08-29T16:04:13+02:00 Amélioration de la conservation du paramétrage des UI - Closes #2926 - - - - - 2 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java ===================================== @@ -88,6 +88,7 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit contentAdjusting = true; try { log.info(String.format("Content ui changed from: %s to %s", previousContentUI == null ? null : previousContentUI.getModel().getPrefix(), contentUI == null ? null : contentUI.getModel().getPrefix())); + swingSessionHelper.save(); if (previousContentUI != null) { log.info(String.format("[%s] Will destroy previous content ui", previousContentUI.getClass().getSimpleName())); previousContentUI.destroy(); @@ -131,7 +132,6 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit log.info(String.format("%sWill open ui", contentUI.getModel().getPrefix())); contentUI.open(); swingSessionHelper.addComponent(contentUI, true); - swingSessionHelper.save(); contentUI.onOpened(); updateContentSize(); log.info(String.format("%s opened", contentUI.getModel().getPrefix())); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java ===================================== @@ -149,6 +149,9 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe throw new IllegalStateException("Can't init twice " + this); } init = true; + // always set the class name as name of the top component, otherwise when saving via SwingSession we can not + // distinguish the UI from another one + ui.setName(ui.getClass().getName()); this.contentOpen = Objects.requireNonNull(createContentOpen(ui)); ContentUIModel model = ui.getModel(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3fcd8bd7cc963ffa160c2e952… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3fcd8bd7cc963ffa160c2e952… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 8 commits: Introduce WithIndex and ContainerChildWithIndexDto API
by Tony CHEMIT (＠tchemit) Aug. 29, 2024

Aug. 29, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 48a90958 by Tony Chemit at 2024-08-29T15:08:53+02:00 Introduce WithIndex and ContainerChildWithIndexDto API - - - - - 39be7c5a by Tony Chemit at 2024-08-29T15:09:59+02:00 use ContainerChildWithIndexDto in ObServe model - - - - - e6b025bc by Tony Chemit at 2024-08-29T15:15:58+02:00 Be able to do actions on JXTableHeader (for the sort actions on reading form) - - - - - fed04bbf by Tony Chemit at 2024-08-29T15:16:35+02:00 Improve JXTableUtil to display index column with a specific renderer - - - - - fcff9d3e by Tony Chemit at 2024-08-29T15:18:12+02:00 Review ContentTableUI API to use WithIndex objects, review also move actions - - - - - f9aa51b5 by Tony Chemit at 2024-08-29T15:20:02+02:00 Adapt forms using WithIndex objects - - - - - de6b582a by Tony Chemit at 2024-08-29T15:33:32+02:00 Merge branch 'feature/issue-1203' into develop Tableaux de saisie (captures, échantillons, équipements...) - Classement en cliquant sur les en-têtes de colonnes - Closes #1203 - - - - - 3f40b543 by Tony Chemit at 2024-08-29T15:36:23+02:00 Amélioration de la conservation du paramétrage des UI - Closes #2926 - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/main/focus/MainUIFocusModel.java - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/SampleContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModel.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/ContentTableUIModelStates.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/entry/move/MoveAbstractAction.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/entry/move/MoveDown.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/entry/move/MoveUp.java - client/datasource/editor/ll/src/main/i18n/getters/navigation.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUITableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jaxx - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/91cd555577fe6f886628e47b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/91cd555577fe6f886628e47b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue-1203
by Tony CHEMIT (＠tchemit) Aug. 29, 2024

Aug. 29, 2024

Tony CHEMIT deleted branch feature/issue-1203 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue-1203] 6 commits: Introduce WithIndex and ContainerChildWithIndexDto API
by Tony CHEMIT (＠tchemit) Aug. 29, 2024

Aug. 29, 2024

Tony CHEMIT pushed to branch feature/issue-1203 at ultreiaio / ird-observe Commits: 48a90958 by Tony Chemit at 2024-08-29T15:08:53+02:00 Introduce WithIndex and ContainerChildWithIndexDto API - - - - - 39be7c5a by Tony Chemit at 2024-08-29T15:09:59+02:00 use ContainerChildWithIndexDto in ObServe model - - - - - e6b025bc by Tony Chemit at 2024-08-29T15:15:58+02:00 Be able to do actions on JXTableHeader (for the sort actions on reading form) - - - - - fed04bbf by Tony Chemit at 2024-08-29T15:16:35+02:00 Improve JXTableUtil to display index column with a specific renderer - - - - - fcff9d3e by Tony Chemit at 2024-08-29T15:18:12+02:00 Review ContentTableUI API to use WithIndex objects, review also move actions - - - - - f9aa51b5 by Tony Chemit at 2024-08-29T15:20:02+02:00 Adapt forms using WithIndex objects - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/main/focus/MainUIFocusModel.java - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/sample/SampleContentTableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/simple/ContentSimpleUIModel.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/ContentTableUIModelStates.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/entry/move/MoveAbstractAction.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/entry/move/MoveDown.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/entry/move/MoveUp.java - client/datasource/editor/ll/src/main/i18n/getters/navigation.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUITableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jaxx - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7fd80a3fdfb0fe8383c598cf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7fd80a3fdfb0fe8383c598cf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Perte dans l'éditeur du type de mesure et de pesée lors de la sélection d'une...
by Tony CHEMIT (＠tchemit) Aug. 28, 2024

Aug. 28, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 885880af by Tony Chemit at 2024-08-28T18:17:52+02:00 Perte dans l'éditeur du type de mesure et de pesée lors de la sélection d'une ligne fraîchement crée dans le tableau des données d'échantillons - Closes #2925 - - - - - 91cd5555 by Tony Chemit at 2024-08-28T18:17:52+02:00 Sanitize SaveTableEntry code and when create property goes back to false - - - - - 3 changed files: - 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/entry/SaveTableEntry.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUIHandler.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUITableModel.java ===================================== @@ -537,12 +537,12 @@ public abstract class ContentTableUITableModel<D extends DataDto, C extends Cont // mettre a jour la ligne C rowBean = getValueAt(editingRow); load(tableEditBean, rowBean); - fireTableRowsUpdated(editingRow, editingRow); if (create) { - // la ligne n'est plus en mode creation + // We are no more in create mode setCreate(false); } + fireTableRowsUpdated(editingRow, editingRow); // plus de modification sur le bean d'édition getValidator().setChanged(false); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/actions/entry/SaveTableEntry.java ===================================== @@ -86,14 +86,11 @@ public class SaveTableEntry extends ContentTableUIActionSupport<ContentTableUI<? // as a side effect on cleaning table edit bean to save, it could now be no more valid return; } - if (contentUI.getTableModel().isCreate()) { - // save new entry - contentUI.getTableModel().updateRowFromEditBean(); + boolean create = contentUI.getTableModel().isCreate(); + contentUI.getTableModel().updateRowFromEditBean(); + if (create) { // now save action (no more add action) updateSaveAction(false); - } else { - // save existing entry - contentUI.getTableModel().updateRowFromEditBean(); } } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUIHandler.java ===================================== @@ -189,13 +189,11 @@ public class SamplePartUIHandler extends GeneratedSamplePartUIHandler { Optional<SizeMeasureTypeReference> sizeMeasureType = Optional.empty(); Optional<WeightMeasureTypeReference> weightMeasureType = Optional.empty(); if (notPersisted) { - boolean unsetSpecies = true; + boolean unsetSpecies = false; if (newRow) { // use default mode AcquisitionMode acquisitionMode = sampleModel.getStates().getDefaultAcquisitionMode(); if (previousRowBean != null) { - //use previous row (species won't be empty) - unsetSpecies = false; // get previous species species = previousRowBean.getSpecies(); @@ -205,8 +203,14 @@ public class SamplePartUIHandler extends GeneratedSamplePartUIHandler { sizeMeasureType = Optional.ofNullable(previousRowBean.getSizeMeasureType()); // get previous weight measure type weightMeasureType = Optional.ofNullable(previousRowBean.getWeightMeasureType()); + } else { + unsetSpecies = true; } updateAcquisitionMode0(acquisitionMode); + } else { + + sizeMeasureType = Optional.ofNullable(tableEditBean.getSizeMeasureType()); + weightMeasureType = Optional.ofNullable(tableEditBean.getWeightMeasureType()); } // get default size measure type View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2c3004b6ef284d1eccef98c8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2c3004b6ef284d1eccef98c8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue-1203] 5 commits: Perte dans l'éditeur du type de mesure et de pesée lors de la sélection d'une...
by Tony CHEMIT (＠tchemit) Aug. 28, 2024

Aug. 28, 2024

Tony CHEMIT pushed to branch feature/issue-1203 at ultreiaio / ird-observe Commits: 885880af by Tony Chemit at 2024-08-28T18:17:52+02:00 Perte dans l'éditeur du type de mesure et de pesée lors de la sélection d'une ligne fraîchement crée dans le tableau des données d'échantillons - Closes #2925 - - - - - 91cd5555 by Tony Chemit at 2024-08-28T18:17:52+02:00 Sanitize SaveTableEntry code and when create property goes back to false - - - - - 35cf1b57 by Tony Chemit at 2024-08-28T18:18:03+02:00 stash - - - - - 21bca727 by Tony Chemit at 2024-08-28T18:18:03+02:00 stash - - - - - 7fd80a3f by Tony Chemit at 2024-08-28T18:18:03+02:00 stash - - - - - 30 changed files: - 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/ContentTableUIModelStates.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/entry/ContentTableUIEntryActionSupport.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/entry/SaveTableEntry.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/entry/move/MoveDown.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/entry/move/MoveUp.java - client/datasource/editor/ll/src/main/i18n/getters/navigation.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUITableModel.java - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/landing/TripLandingUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleSpeciesUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SampleUITableModel.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUITableModel.java - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/table/GenerateContentTableUITableModel.java - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/dto/src/main/java/fr/ird/observe/dto/ObserveI18nLabelsBuilder.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivitySampleDto.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/SampleDto.java - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - model/src/main/models/Observe/dto/00-common.model The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b620652b469dd99ea41a4a1c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b620652b469dd99ea41a4a1c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue-1203
by Tony CHEMIT (＠tchemit) Aug. 27, 2024

Aug. 27, 2024

Tony CHEMIT pushed new branch feature/issue-1203 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/feature/issue-1203 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 9 commits: Fix DateSupport code (comparing Timestamp and Date is not ok)
by Tony CHEMIT (＠tchemit) Aug. 27, 2024

Aug. 27, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2993dea4 by Tony Chemit at 2024-08-27T14:42:47+02:00 Fix DateSupport code (comparing Timestamp and Date is not ok) - - - - - 4b6cf9fe by Tony Chemit at 2024-08-27T14:42:47+02:00 Fix DtoFormValidatorTransformer dayFunction and timeFunction (for timestamp property) - - - - - a5f0d534 by Tony Chemit at 2024-08-27T14:43:05+02:00 Add common I18n for xxxDate properties on Set - - - - - c89c59e3 by Tony Chemit at 2024-08-27T14:43:05+02:00 Decompose xxxTimestamp properties on Set - - - - - 22b7e8d2 by Tony Chemit at 2024-08-27T14:43:05+02:00 Review validation temporal rules for Logbook.(Activity/Set) - - - - - c7d06f95 by Tony Chemit at 2024-08-27T14:43:05+02:00 Review validator on ui for temporal rules Logbook.(Activity/Set) - - - - - 67dba823 by Tony Chemit at 2024-08-27T14:43:05+02:00 Review validation temporal rules for Observation.(Activity/Set) - - - - - 5897abc9 by Tony Chemit at 2024-08-27T14:43:05+02:00 Review validator on ui for temporal rules Observation.(Activity/Set) - - - - - 2c3004b6 by Tony Chemit at 2024-08-27T15:03:33+02:00 Merge branch 'feature/issue-2904' into develop LL observations / logbook : Revue des contrôles sur la cohérences des dates sur les calées - Closes #2904 - - - - - 30 changed files: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetUI.jaxx - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/dto/src/main/java/fr/ird/observe/dto/ObserveI18nLabelsBuilder.java - − core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/SetDto.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/i18n/getters/validation-messages.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/ActivityDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/ActivityDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDto-update-error-validation.xml - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Activity/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Activity/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Set/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Set/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/Activity/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/Activity/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/Set/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/Set/validation-update.json - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/81ec39196f52edb32797b93a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/81ec39196f52edb32797b93a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue-2904
by Tony CHEMIT (＠tchemit) Aug. 27, 2024

Aug. 27, 2024

Tony CHEMIT deleted branch feature/issue-2904 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue-2904] 8 commits: Fix DateSupport code (comparing Timestamp and Date is not ok)
by Tony CHEMIT (＠tchemit) Aug. 27, 2024

Aug. 27, 2024

Tony CHEMIT pushed to branch feature/issue-2904 at ultreiaio / ird-observe Commits: 2993dea4 by Tony Chemit at 2024-08-27T14:42:47+02:00 Fix DateSupport code (comparing Timestamp and Date is not ok) - - - - - 4b6cf9fe by Tony Chemit at 2024-08-27T14:42:47+02:00 Fix DtoFormValidatorTransformer dayFunction and timeFunction (for timestamp property) - - - - - a5f0d534 by Tony Chemit at 2024-08-27T14:43:05+02:00 Add common I18n for xxxDate properties on Set - - - - - c89c59e3 by Tony Chemit at 2024-08-27T14:43:05+02:00 Decompose xxxTimestamp properties on Set - - - - - 22b7e8d2 by Tony Chemit at 2024-08-27T14:43:05+02:00 Review validation temporal rules for Logbook.(Activity/Set) - - - - - c7d06f95 by Tony Chemit at 2024-08-27T14:43:05+02:00 Review validator on ui for temporal rules Logbook.(Activity/Set) - - - - - 67dba823 by Tony Chemit at 2024-08-27T14:43:05+02:00 Review validation temporal rules for Observation.(Activity/Set) - - - - - 5897abc9 by Tony Chemit at 2024-08-27T14:43:05+02:00 Review validator on ui for temporal rules Observation.(Activity/Set) - - - - - 30 changed files: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetUI.jaxx - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/dto/src/main/java/fr/ird/observe/dto/ObserveI18nLabelsBuilder.java - − core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/SetDto.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/i18n/getters/validation-messages.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/ActivityDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/ActivityDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDto-update-error-validation.xml - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Activity/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Activity/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Set/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Set/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/Activity/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/Activity/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/Set/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/Set/validation-update.json - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a0b6f4ac247a6b344b44d23a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a0b6f4ac247a6b344b44d23a… You're receiving this email because of your account on gitlab.com.

1 0