Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
4d23a36c
by Tony Chemit at 2024-01-18T18:09:20+01:00
3 changed files:
- client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java
- client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingUIHandler.java
- client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/actions/Prepare.java
Changes:
| ... | ... | @@ -193,7 +193,7 @@ public class AdminTabUIHandler<U extends AdminTabUI> implements WithClientUICont |
| 193 | 193 | |
| 194 | 194 | protected void onComingFromNextStepAdjust() {
|
| 195 | 195 | AdminUIModel model = ui.getModel();
|
| 196 | - if (model.containsOperation(AdminStep.VALIDATE) ||
|
|
| 196 | + if (model.containsOperation(AdminStep.VALIDATE) || model.containsOperation(AdminStep.ACTIVITY_PAIRING) ||
|
|
| 197 | 197 | (model.containsOperation(AdminStep.CONSOLIDATE) && !model.containsOperation(AdminStep.EXPORT_DATA))) {
|
| 198 | 198 | if (model.getStepState(AdminStep.CONSOLIDATE) == WizardState.SUCCESSED) {
|
| 199 | 199 | // set back to pending consolidate step
|
| ... | ... | @@ -203,6 +203,9 @@ public class AdminTabUIHandler<U extends AdminTabUI> implements WithClientUICont |
| 203 | 203 | model.setStepState(AdminStep.VALIDATE, WizardState.PENDING);
|
| 204 | 204 | // reset report model
|
| 205 | 205 | model.getValidateModel().reset();
|
| 206 | + } else if (model.getStepState(AdminStep.ACTIVITY_PAIRING) == WizardState.NEED_FIX || model.getStepState(AdminStep.ACTIVITY_PAIRING) == WizardState.SUCCESSED) {
|
|
| 207 | + // set back to pending activity pairing step
|
|
| 208 | + model.setStepState(AdminStep.ACTIVITY_PAIRING, WizardState.PENDING);
|
|
| 206 | 209 | }
|
| 207 | 210 | }
|
| 208 | 211 | }
|
| ... | ... | @@ -37,5 +37,6 @@ public class ActivityPairingUIHandler extends AdminTabUIHandler<ActivityPairingU |
| 37 | 37 | super.afterInit(ui);
|
| 38 | 38 | setAutoStart(ui.getPrepare());
|
| 39 | 39 | hideFixedPanelLabel(ui);
|
| 40 | + ui.remove(ui.getDescriptionContainer());
|
|
| 40 | 41 | }
|
| 41 | 42 | } |
| ... | ... | @@ -87,7 +87,6 @@ public class Prepare extends ActivityPairingUIActionSupport { |
| 87 | 87 | }
|
| 88 | 88 | break;
|
| 89 | 89 | }
|
| 90 | - ui.getModel().setWasDone(true);
|
|
| 91 | 90 | stepModel.recomputeSelectedValues();
|
| 92 | 91 | return WizardState.NEED_FIX;
|
| 93 | 92 | }
|