This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 1e1adbb60e501007b4cef777b2e5e36f2c5392bf Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jan 16 10:02:33 2016 +0100 Pouvoir lors de l'import générique utiliser des objets obsolètes (partie ui) (See #7909) --- .../filtered-resources/tutti-help-fr.properties | 5 +-- .../actions/AbstractChangeScreenAction.java | 44 ++++++++++++++++++++++ .../actions/OpenGenericFormatImportScreen.java | 2 +- .../genericformat/GenericFormatImportUI.jaxx | 5 +++ .../genericformat/GenericFormatImportUI.jcss | 7 ++++ .../GenericFormatImportUIHandler.java | 14 ++++--- .../genericformat/GenericFormatImportUIModel.java | 16 ++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 +++ 9 files changed, 95 insertions(+), 10 deletions(-) diff --git a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties index 4b45b20..8382f32 100644 --- a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties +++ b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties @@ -1,8 +1,6 @@ ### # #%L # Tutti :: UI -# $Id:$ -# $HeadURL:$ # %% # Copyright (C) 2012 - 2015 Ifremer # %% @@ -22,7 +20,7 @@ # #L% ### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Wed Dec 23 19:23:27 CET 2015 +#Fri Jan 15 19:43:38 CET 2016 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -370,6 +368,7 @@ tutti.genericFormatImport.action.showReport.help=genericFormat.html\#generic_for tutti.genericFormatImport.action.unfoldAll.help=genericFormat.html\#generic_format_import_actions tutti.genericFormatImport.action.unselectAll.help=genericFormat.html\#generic_format_import_actions tutti.genericFormatImport.action.validate.help=genericFormat.html\#generic_format_import_actions +tutti.genericFormatImport.field.authorizeObsoleteReferentials.help=genericFormat.html\#generic_format_import_fields tutti.genericFormatImport.field.checkWeights.help=genericFormat.html\#generic_format_import_fields tutti.genericFormatImport.field.cleanWeights.help=genericFormat.html\#generic_format_import_fields tutti.genericFormatImport.field.importAccidentalCatch.help=genericFormat.html\#generic_format_import_fields diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/AbstractChangeScreenAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/AbstractChangeScreenAction.java index 2b63618..ab67344 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/AbstractChangeScreenAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/AbstractChangeScreenAction.java @@ -149,4 +149,48 @@ public abstract class AbstractChangeScreenAction extends AbstractMainUITuttiActi } + protected void loadReferantialsWithObsoletes(boolean createProgressionModel) { + + ProgressionModel progressionModel; + + if (createProgressionModel) { + + progressionModel = new ProgressionModel(); + progressionModel.setTotal(9); + setProgressionModel(progressionModel); + + } else { + + progressionModel = getProgressionModel(); + + } + + progressionModel.increments(t("tutti.openScreen.step.loading.allGear")); + getContext().getPersistenceService().getAllGear(); + + progressionModel.increments(t("tutti.openScreen.step.loading.allGearWithObsoletes")); + getContext().getPersistenceService().getAllGearWithObsoletes(); + + progressionModel.increments(t("tutti.openScreen.step.loading.allPerson")); + getContext().getPersistenceService().getAllPerson(); + + progressionModel.increments(t("tutti.openScreen.step.loading.allPersonWithObsoletes")); + getContext().getPersistenceService().getAllPersonWithObsoletes(); + + progressionModel.increments(t("tutti.openScreen.step.loading.allSpecies")); + getContext().getPersistenceService().getAllSpecies(); + + progressionModel.increments(t("tutti.openScreen.step.loading.allSpeciesWithObsoletes")); + getContext().getPersistenceService().getAllReferentSpeciesWithObsoletes(); + + progressionModel.increments(t("tutti.openScreen.step.loading.allVessel")); + getContext().getPersistenceService().getAllVessel(); + + progressionModel.increments(t("tutti.openScreen.step.loading.allVesselWithObsoletes")); + getContext().getPersistenceService().getAllVesselWithObsoletes(); + + progressionModel.increments(t("tutti.openScreen.step.loading.ui")); + + } + } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenGenericFormatImportScreen.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenGenericFormatImportScreen.java index 0d37085..1b630c7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenGenericFormatImportScreen.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenGenericFormatImportScreen.java @@ -42,7 +42,7 @@ public class OpenGenericFormatImportScreen extends AbstractChangeScreenAction { @Override public void doAction() throws Exception { - loadReferantials(true); + loadReferantialsWithObsoletes(true); super.doAction(); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx index b282482..ac4f3e2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx @@ -80,6 +80,11 @@ <FileEditor id='importFile' onActionPerformed='handler.setFile(event, "importFile")'/> </cell> </row> + <row> + <cell anchor='west' columns="2"> + <JCheckBox id='authorizeObsoleteReferentialsCheckBox' onItemStateChanged='handler.setBoolean(event, "authorizeObsoleteReferentials")'/> + </cell> + </row> <!-- validate action --> <row> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jcss index 85dbd86..bd24e3f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jcss @@ -206,6 +206,13 @@ JTextField { _help: {"tutti.genericFormatImport.field.checkWeights.help"}; } +#authorizeObsoleteReferentialsCheckBox { + text: "tutti.genericFormatImport.field.authorizeObsoleteReferentials"; + selected: {model.isAuthorizeObsoleteReferentials()}; + toolTipText: "tutti.genericFormatImport.field.authorizeObsoleteReferentials.tip"; + _help: {"tutti.genericFormatImport.field.authorizeObsoleteReferentials.help"}; +} + #importButton { actionIcon: import; text: "tutti.genericFormatImport.action.import"; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIHandler.java index b5c3545..c71a57a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIHandler.java @@ -85,12 +85,14 @@ public class GenericFormatImportUIHandler extends AbstractTuttiUIHandler<Generic model.addPropertyChangeListener(new PropertyChangeListener() { - final Set<String> propertyNamesToCanValidate = Sets.newHashSet(GenericFormatImportUIModel.PROPERTY_IMPORT_FILE, GenericFormatImportUIModel.PROPERTY_PROGRAM); + final Set<String> propertyNamesToCanValidate = Sets.newHashSet(GenericFormatImportUIModel.PROPERTY_IMPORT_FILE, + GenericFormatImportUIModel.PROPERTY_PROGRAM, + GenericFormatImportUIModel.PROPERTY_AUTHORIZE_OBSOLETE_REFERENTIALS); final Set<String> propertyNamesToCanImport = Sets.newHashSet(GenericFormatImportUIModel.PROPERTY_VALIDATE_DONE, - GenericFormatImportUIModel.PROPERTY_PROGRAM, - GenericFormatImportUIModel.PROPERTY_VALIDATE_RESULT, - GenericFormatImportUIModel.PROPERTY_DATA_SELECTED); + GenericFormatImportUIModel.PROPERTY_PROGRAM, + GenericFormatImportUIModel.PROPERTY_VALIDATE_RESULT, + GenericFormatImportUIModel.PROPERTY_DATA_SELECTED); @Override public void propertyChange(PropertyChangeEvent evt) { @@ -180,8 +182,8 @@ public class GenericFormatImportUIHandler extends AbstractTuttiUIHandler<Generic GenericFormatImportUIModel model = getModel(); initBeanFilterableComboBox(ui.getProgramComboBox(), - Lists.newArrayList(getPersistenceService().getAllProgram()), - model.getProgram()); + Lists.newArrayList(getPersistenceService().getAllProgram()), + model.getProgram()); SwingValidator validator = ui.getValidator(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIModel.java index e49dee4..05d1f2c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIModel.java @@ -88,6 +88,8 @@ public class GenericFormatImportUIModel extends AbstractSerializableBean { public static final String PROPERTY_DATA_SELECTED = "dataSelected"; + public static final String PROPERTY_AUTHORIZE_OBSOLETE_REFERENTIALS = "authorizeObsoleteReferentials"; + private Program program; private File importFile; @@ -114,6 +116,8 @@ public class GenericFormatImportUIModel extends AbstractSerializableBean { private boolean canValidate; + private boolean authorizeObsoleteReferentials; + private File validateReportFile; private GenericFormatValidateFileResult validateResult; @@ -143,6 +147,7 @@ public class GenericFormatImportUIModel extends AbstractSerializableBean { configuration.setImportAccidentalCatch(importAccidentalCatch); configuration.setImportIndividualObservation(importIndividualObservation); configuration.setImportAttachments(importAttachments); + configuration.setAuthorizeObsoleteReferentials(authorizeObsoleteReferentials); configuration.setCleanWeights(cleanWeights); configuration.setCheckWeights(checkWeights); @@ -170,6 +175,7 @@ public class GenericFormatImportUIModel extends AbstractSerializableBean { configuration.setImportAccidentalCatch(importAccidentalCatch); configuration.setImportIndividualObservation(importIndividualObservation); configuration.setImportAttachments(importAttachments); + configuration.setAuthorizeObsoleteReferentials(authorizeObsoleteReferentials); configuration.setCleanWeights(cleanWeights); configuration.setCheckWeights(checkWeights); @@ -368,6 +374,16 @@ public class GenericFormatImportUIModel extends AbstractSerializableBean { firePropertyChange(PROPERTY_DATA_SELECTED, null, dataSelected); } + public boolean isAuthorizeObsoleteReferentials() { + return authorizeObsoleteReferentials; + } + + public void setAuthorizeObsoleteReferentials(boolean authorizeObsoleteReferentials) { + Object oldValue = isAuthorizeObsoleteReferentials(); + this.authorizeObsoleteReferentials = authorizeObsoleteReferentials; + firePropertyChange(PROPERTY_AUTHORIZE_OBSOLETE_REFERENTIALS, oldValue, authorizeObsoleteReferentials); + } + public boolean isImportDone() { return importResult != null; } diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 5fbb92f..a4669b9 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -1570,6 +1570,8 @@ tutti.genericFormatImport.action.validateImportFile.mnemonic= tutti.genericFormatImport.action.validateImportFile.tip= tutti.genericFormatImport.backupFile.extension= tutti.genericFormatImport.backupFile.extension.description= +tutti.genericFormatImport.field.authorizeObsoleteReferentials= +tutti.genericFormatImport.field.authorizeObsoleteReferentials.tip= tutti.genericFormatImport.field.backupFile= tutti.genericFormatImport.field.backupFile.tip= tutti.genericFormatImport.field.checkWeights= @@ -1940,9 +1942,13 @@ tutti.openReplaceTemporaryVesselUI.loading.source= tutti.openReplaceTemporaryVesselUI.loading.target= tutti.openReplaceTemporaryVesselUI.open.dialog= tutti.openScreen.step.loading.allGear= +tutti.openScreen.step.loading.allGearWithObsoletes= tutti.openScreen.step.loading.allPerson= +tutti.openScreen.step.loading.allPersonWithObsoletes= tutti.openScreen.step.loading.allSpecies= +tutti.openScreen.step.loading.allSpeciesWithObsoletes= tutti.openScreen.step.loading.allVessel= +tutti.openScreen.step.loading.allVesselWithObsoletes= tutti.openScreen.step.loading.ui= tutti.option.cancel= tutti.option.cancelExport= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index c167ced..61efbe2 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -1488,6 +1488,8 @@ tutti.genericFormatImport.action.validate.mnemonic=V tutti.genericFormatImport.action.validate.tip=Valider l'archive d'import tutti.genericFormatImport.backupFile.extension=zip tutti.genericFormatImport.backupFile.extension.description=Sauvegarde de la base (.zip) +tutti.genericFormatImport.field.authorizeObsoleteReferentials=Autoriser l'utilisation de référentiels obsolètes +tutti.genericFormatImport.field.authorizeObsoleteReferentials.tip=Autoriser l'utilisation des référentiels obsolètes dans les données à importer tutti.genericFormatImport.field.backupFile=Fichier de sauvegarde tutti.genericFormatImport.field.backupFile.tip=Fichier de sauvegarde de la base avant import tutti.genericFormatImport.field.checkWeights=Vérifier les poids (élévation) @@ -1818,9 +1820,13 @@ tutti.openReplaceTemporaryUI.loading.source=Chargement des référentiels tempor tutti.openReplaceTemporaryUI.loading.target=Chargement des référentiels officiels de type %s tutti.openReplaceTemporaryUI.open.dialog=Ouverture de l'interface graphique tutti.openScreen.step.loading.allGear=Chargement du référentiel Engin +tutti.openScreen.step.loading.allGearWithObsoletes=Chargement du référentiel Engin (avec non actifs) tutti.openScreen.step.loading.allPerson=Chargement du référentiel Personne +tutti.openScreen.step.loading.allPersonWithObsoletes=Chargement du référentiel Personne (avec non actifs) tutti.openScreen.step.loading.allSpecies=Chargement du référentiel Taxinomique +tutti.openScreen.step.loading.allSpeciesWithObsoletes=Chargement du référentiel Taxinomique (avec non actifs) tutti.openScreen.step.loading.allVessel=Chargement du référentiel Navire +tutti.openScreen.step.loading.allVesselWithObsoletes=Chargement du référentiel Navire (avec non actifs) tutti.openScreen.step.loading.ui=Chargement des interfaces graphiques tutti.option.cancel=Annuler tutti.option.cancelExport=Annuler l'export -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.