branch develop updated (da73b68 -> ec2d2c0)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from da73b68 Livrable #8278 Merge branch 'feature/8278' into develop new ec2d2c0 Ne pas fermer de nouveau l'écran des mensurations si on change d'onglet quand on change de trait :(... The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ec2d2c0c5d6536efc2eecdd95f0f9595667c18b6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 26 15:25:15 2016 +0200 Ne pas fermer de nouveau l'écran des mensurations si on change d'onglet quand on change de trait :(... Summary of changes: .../operation/catches/EditCatchesUIHandler.java | 2 +- .../content/operation/catches/EditCatchesUIModel.java | 15 +++++++++++++++ .../fishing/actions/EditFishingOperationAction.java | 19 ++++++++++--------- 3 files changed, 26 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit ec2d2c0c5d6536efc2eecdd95f0f9595667c18b6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 26 15:25:15 2016 +0200 Ne pas fermer de nouveau l'écran des mensurations si on change d'onglet quand on change de trait :(... --- .../operation/catches/EditCatchesUIHandler.java | 2 +- .../content/operation/catches/EditCatchesUIModel.java | 15 +++++++++++++++ .../fishing/actions/EditFishingOperationAction.java | 19 ++++++++++--------- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java index f26682b..430c855 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java @@ -251,7 +251,7 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi if (result && currentIndex != newIndex) { - result = blockIfNotLeavingFrequencyScreen(); + result = getModel().isDoNotCheckLeavingFrequencyScreen() || blockIfNotLeavingFrequencyScreen(); if (!result) { return false; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java index c0c7494..8ec9168 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java @@ -157,6 +157,13 @@ public class EditCatchesUIModel extends AbstractTuttiBeanUIModel<CatchBatch, Edi */ protected final WeightUnit marineLitterWeightUnit; + /** + * Pour ne pas vérifier si on peut quitter l'écran des mensurations. + * + * @since 4.5 + */ + private boolean doNotCheckLeavingFrequencyScreen; + public EditCatchesUIModel(WeightUnit speciesWeightUnit, WeightUnit benthosWeightUnit, WeightUnit marineLitterWeightUnit) { @@ -955,4 +962,12 @@ public class EditCatchesUIModel extends AbstractTuttiBeanUIModel<CatchBatch, Edi setSpeciesDistinctUnsortedSpeciesCount(null); setBenthosDistinctUnsortedSpeciesCount(null); } + + public boolean isDoNotCheckLeavingFrequencyScreen() { + return doNotCheckLeavingFrequencyScreen; + } + + public void setDoNotCheckLeavingFrequencyScreen(boolean doNotCheckLeavingFrequencyScreen) { + this.doNotCheckLeavingFrequencyScreen = doNotCheckLeavingFrequencyScreen; + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/EditFishingOperationAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/EditFishingOperationAction.java index 9b6a6bd..89a4c0c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/EditFishingOperationAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/EditFishingOperationAction.java @@ -349,14 +349,7 @@ public class EditFishingOperationAction extends LongActionSupport<FishingOperati // on est sur l'écran des mensurations / observations individuelles SpeciesFrequencyUI editFrequenciesUI = speciesOrBenthosUI.getEditFrequenciesUI(); - if (editFrequenciesUI.getModel().isModify()) { - - // Ask confirmation to quit screen - if (log.isInfoEnabled()) { - log.info("Frequencies model was modified, ask user confirmation."); - } - canContinue = editFrequenciesUI.getHandler().askCancelEditBeforeLeaving(); - } + canContinue = editFrequenciesUI.leaveIfConfirmed(); } } @@ -445,7 +438,15 @@ public class EditFishingOperationAction extends LongActionSupport<FishingOperati ui.getFishingOperationTabContent().getFishingOperationTabPane().setSelectedIndex(0); if (checkPreviousEdit) { - ui.getTabPane().setSelectedIndex(0); + + ui.getCatchesTabContent().getModel().setDoNotCheckLeavingFrequencyScreen(true); + + try { + ui.getTabPane().setSelectedIndex(0); + } finally { + + ui.getCatchesTabContent().getModel().setDoNotCheckLeavingFrequencyScreen(false); + } } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm