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/2c3004b6ef284d1eccef98c82... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2c3004b6ef284d1eccef98c82... You're receiving this email because of your account on gitlab.com.