Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
2cc16312
by tchemit at 2019-06-09T14:40:19Z
3 changed files:
- client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveLonglineDetailCompositionObsUIAction.java
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jcss
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIHandler.java
Changes:
| ... | ... | @@ -34,6 +34,7 @@ import fr.ird.observe.dto.data.ll.observation.SectionObsWithTemplate; |
| 34 | 34 |
import fr.ird.observe.dto.data.ll.observation.SetLonglineObsDetailCompositionDto;
|
| 35 | 35 |
import fr.ird.observe.dto.result.SaveResultDto;
|
| 36 | 36 |
import fr.ird.observe.navigation.model.edit.ObserveEditNode;
|
| 37 |
+import org.nuiton.jaxx.validator.swing.SwingValidatorUtil;
|
|
| 37 | 38 |
|
| 38 | 39 |
/**
|
| 39 | 40 |
* Created by tchemit on 28/09/2018.
|
| ... | ... | @@ -78,7 +79,7 @@ public class SaveLonglineDetailCompositionObsUIAction extends SaveSimpleDataUIAc |
| 78 | 79 |
BranchlineObsDto branchline = ui.getBranchlinesTableModel().getSelectedRow();
|
| 79 | 80 |
super.afterSave(ui, bean);
|
| 80 | 81 |
if (branchline != null) {
|
| 81 |
- ui.getBranchlineDetailUI().edit(branchline);
|
|
| 82 |
+ ui.getHandler().editBranchline(branchline);
|
|
| 82 | 83 |
}
|
| 83 | 84 |
}
|
| 84 | 85 |
}
|
| ... | ... | @@ -71,6 +71,10 @@ |
| 71 | 71 |
/* COMPOSITION TAB ************************************************************ */
|
| 72 | 72 |
/* ***************************************************************************** */
|
| 73 | 73 |
|
| 74 |
+#compositionTab {
|
|
| 75 |
+ enabled: {model.isGenerateTabValid()};
|
|
| 76 |
+}
|
|
| 77 |
+ |
|
| 74 | 78 |
#generateAll {
|
| 75 | 79 |
_observeAction:{LonglineDetailCompositionGenerateAllSectionsAction.ACTION_NAME};
|
| 76 | 80 |
visible: {model.isUpdatingMode()};
|
| ... | ... | @@ -969,4 +969,21 @@ public class LonglineDetailCompositionObsUIHandler extends ContentSimpleUIHandle |
| 969 | 969 |
return validationHelper;
|
| 970 | 970 |
}
|
| 971 | 971 |
|
| 972 |
+ @Override
|
|
| 973 |
+ public void resetEditUI() {
|
|
| 974 |
+ BranchlineObsDto branchline = ui.getBranchlinesTableModel().getSelectedRow();
|
|
| 975 |
+ super.resetEditUI();
|
|
| 976 |
+ if (branchline != null) {
|
|
| 977 |
+ ui.getHandler().editBranchline(branchline);
|
|
| 978 |
+ }
|
|
| 979 |
+ }
|
|
| 980 |
+ |
|
| 981 |
+ public void editBranchline(BranchlineObsDto branchline) {
|
|
| 982 |
+ boolean changed = ui.getValidator().isChanged();
|
|
| 983 |
+ try {
|
|
| 984 |
+ ui.getBranchlineDetailUI().edit(branchline);
|
|
| 985 |
+ } finally {
|
|
| 986 |
+ ui.getValidator().setChanged(changed);
|
|
| 987 |
+ }
|
|
| 988 |
+ }
|
|
| 972 | 989 |
}
|