Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
885880af
by Tony Chemit at 2024-08-28T18:17:52+02:00
-
91cd5555
by Tony Chemit at 2024-08-28T18:17:52+02:00
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:
| ... | ... | @@ -537,12 +537,12 @@ public abstract class ContentTableUITableModel<D extends DataDto, C extends Cont |
| 537 | 537 | // mettre a jour la ligne
|
| 538 | 538 | C rowBean = getValueAt(editingRow);
|
| 539 | 539 | load(tableEditBean, rowBean);
|
| 540 | - fireTableRowsUpdated(editingRow, editingRow);
|
|
| 541 | 540 | |
| 542 | 541 | if (create) {
|
| 543 | - // la ligne n'est plus en mode creation
|
|
| 542 | + // We are no more in create mode
|
|
| 544 | 543 | setCreate(false);
|
| 545 | 544 | }
|
| 545 | + fireTableRowsUpdated(editingRow, editingRow);
|
|
| 546 | 546 | |
| 547 | 547 | // plus de modification sur le bean d'édition
|
| 548 | 548 | getValidator().setChanged(false);
|
| ... | ... | @@ -86,14 +86,11 @@ public class SaveTableEntry extends ContentTableUIActionSupport<ContentTableUI<? |
| 86 | 86 | // as a side effect on cleaning table edit bean to save, it could now be no more valid
|
| 87 | 87 | return;
|
| 88 | 88 | }
|
| 89 | - if (contentUI.getTableModel().isCreate()) {
|
|
| 90 | - // save new entry
|
|
| 91 | - contentUI.getTableModel().updateRowFromEditBean();
|
|
| 89 | + boolean create = contentUI.getTableModel().isCreate();
|
|
| 90 | + contentUI.getTableModel().updateRowFromEditBean();
|
|
| 91 | + if (create) {
|
|
| 92 | 92 | // now save action (no more add action)
|
| 93 | 93 | updateSaveAction(false);
|
| 94 | - } else {
|
|
| 95 | - // save existing entry
|
|
| 96 | - contentUI.getTableModel().updateRowFromEditBean();
|
|
| 97 | 94 | }
|
| 98 | 95 | }
|
| 99 | 96 |
| ... | ... | @@ -189,13 +189,11 @@ public class SamplePartUIHandler extends GeneratedSamplePartUIHandler { |
| 189 | 189 | Optional<SizeMeasureTypeReference> sizeMeasureType = Optional.empty();
|
| 190 | 190 | Optional<WeightMeasureTypeReference> weightMeasureType = Optional.empty();
|
| 191 | 191 | if (notPersisted) {
|
| 192 | - boolean unsetSpecies = true;
|
|
| 192 | + boolean unsetSpecies = false;
|
|
| 193 | 193 | if (newRow) {
|
| 194 | 194 | // use default mode
|
| 195 | 195 | AcquisitionMode acquisitionMode = sampleModel.getStates().getDefaultAcquisitionMode();
|
| 196 | 196 | if (previousRowBean != null) {
|
| 197 | - //use previous row (species won't be empty)
|
|
| 198 | - unsetSpecies = false;
|
|
| 199 | 197 | |
| 200 | 198 | // get previous species
|
| 201 | 199 | species = previousRowBean.getSpecies();
|
| ... | ... | @@ -205,8 +203,14 @@ public class SamplePartUIHandler extends GeneratedSamplePartUIHandler { |
| 205 | 203 | sizeMeasureType = Optional.ofNullable(previousRowBean.getSizeMeasureType());
|
| 206 | 204 | // get previous weight measure type
|
| 207 | 205 | weightMeasureType = Optional.ofNullable(previousRowBean.getWeightMeasureType());
|
| 206 | + } else {
|
|
| 207 | + unsetSpecies = true;
|
|
| 208 | 208 | }
|
| 209 | 209 | updateAcquisitionMode0(acquisitionMode);
|
| 210 | + } else {
|
|
| 211 | + |
|
| 212 | + sizeMeasureType = Optional.ofNullable(tableEditBean.getSizeMeasureType());
|
|
| 213 | + weightMeasureType = Optional.ofNullable(tableEditBean.getWeightMeasureType());
|
|
| 210 | 214 | }
|
| 211 | 215 | |
| 212 | 216 | // get default size measure type
|