[Tutti-commits] 03/04: Ajout des actions pour l'import-export multi-poste sur l'écran des espèces (See #8061)

This is an automated email from the git hooks/post-receive script. New commit to branch feature/8061 in repository tutti. See http://git.codelutin.com/tutti.git commit 5d268178b9a2ea7a6066bd51995a791a3be8b913 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 9 17:11:37 2016 +0100 Ajout des actions pour l'import-export multi-poste sur l'écran des espèces (See #8061) --- .../filtered-resources/tutti-help-fr.properties | 8 ++- .../operation/catches/species/SpeciesBatchUI.jaxx | 13 +++- .../operation/catches/species/SpeciesBatchUI.jcss | 76 ++++++++++++++++++---- ....java => ExportMultiPostSpeciesFullAction.java} | 16 ++--- ...portMultiPostSpeciesOnlyFrequenciesAction.java} | 16 ++--- ...stSpeciesOnlyIndividualObservationsAction.java} | 16 ++--- ....java => ImportMultiPostSpeciesFullAction.java} | 12 ++-- ...portMultiPostSpeciesOnlyFrequenciesAction.java} | 16 ++--- ...stSpeciesOnlyIndividualObservationsAction.java} | 16 ++--- .../resources/i18n/tutti-ui-swing_en_GB.properties | 43 ++++++++++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 60 +++++++++++++---- 11 files changed, 217 insertions(+), 75 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 e990a30..7c5f8c8 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,5 +1,5 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Tue Mar 08 18:29:34 CET 2016 +#Wed Mar 09 16:42:42 CET 2016 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -278,8 +278,14 @@ tutti.editSpeciesBatch.action.createBatch.help=editFishingOperation.html\#captur tutti.editSpeciesBatch.action.createMelag.help=editFishingOperation.html\#captureEspecesActions tutti.editSpeciesBatch.action.editFrequencies.help=editFishingOperation.html\#captureEspecesActions tutti.editSpeciesBatch.action.exportMultiPost.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.exportMultiPostFull.help= +tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies.help= +tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations.help= tutti.editSpeciesBatch.action.importBigfin.help=editFishingOperation.html\#captureEspecesActions tutti.editSpeciesBatch.action.importMultiPost.help=editFishingOperation.html\#captureEspecesActions +tutti.editSpeciesBatch.action.importMultiPostFull.help= +tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies.help= +tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations.help= tutti.editSpeciesBatch.action.importPsion.help=editFishingOperation.html\#captureEspecesActions tutti.editSpeciesBatch.action.importPupitri.help=editFishingOperation.html\#captureEspecesActions tutti.editSpeciesBatch.action.removeBatch.help=editFishingOperation.html\#captureEspecesActions diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx index 765592a..baad293 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx @@ -65,8 +65,17 @@ public SpeciesBatchUI(TuttiUI<?,?> parentUI) { <JMenuItem id='importPupitriButton'/> <JMenuItem id='importPsionButton'/> <JMenuItem id='importBigfinButton'/> - <JMenuItem id='importMultiPostButton'/> - <JMenuItem id='exportMultiPostButton'/> + <JMenu id='menuImportMultiPost'> + <JMenuItem id='importMultiPostFullButton'/> + <JMenuItem id='importMultiPostOnlyFrequenciesButton'/> + <JMenuItem id='importMultiPostOnlyIndividualObservationsButton'/> + </JMenu> + <JMenu id='menuExportMultiPost'> + <JMenuItem id='exportMultiPostFullButton'/> + <JMenuItem id='exportMultiPostOnlyFrequenciesButton'/> + <JMenuItem id='exportMultiPostOnlyIndividualObservationsButton'/> + + </JMenu> </JMenu> </JMenuBar> <ButtonAttachment id='speciesBatchAttachmentsButton' diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jcss index b2892ea..2c011dc 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jcss @@ -59,6 +59,22 @@ ComputableDataEditor { i18nMnemonic: "tutti.toolbar.menu.action.mnemonic"; } +#menuImportMultiPost { + opaque: true; + actionIcon: import; + text: "tutti.toolbar.menuImportMultiPost.action"; + toolTipText: "tutti.toolbar.menuImportMultiPost.action.tip"; + i18nMnemonic: "tutti.toolbar.menuImportMultiPost.action.mnemonic"; +} + +#menuExportMultiPost { + opaque: true; + actionIcon: export; + text: "tutti.toolbar.menuExportMultiPost.action"; + toolTipText: "tutti.toolbar.menuExportMultiPost.action.tip"; + i18nMnemonic: "tutti.toolbar.menuExportMultiPost.action.mnemonic"; +} + #speciesBatchAttachmentsButton { toolTipText: "tutti.editSpeciesBatch.action.attachments.tip"; focusPainted: false; @@ -287,22 +303,58 @@ ComputableDataEditor { _help: {"tutti.editSpeciesBatch.action.importBigfin.help"}; } -#importMultiPostButton { +#importMultiPostFullButton { + actionIcon: import; + text: "tutti.editSpeciesBatch.action.importMultiPostFull"; + toolTipText: "tutti.editSpeciesBatch.action.importMultiPostFull.tip"; + i18nMnemonic: "tutti.editSpeciesBatch.action.importMultiPostFull.mnemonic"; + _applicationAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions.ImportMultiPostSpeciesFullAction.class}; + _help: {"tutti.editSpeciesBatch.action.importMultiPostFull.help"}; +} + +#importMultiPostOnlyFrequenciesButton { actionIcon: import; - text: "tutti.editSpeciesBatch.action.importMultiPost"; - toolTipText: "tutti.editSpeciesBatch.action.importMultiPost.tip"; - i18nMnemonic: "tutti.editSpeciesBatch.action.importMultiPost.mnemonic"; - _applicationAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions.ImportMultiPostSpeciesAction.class}; - _help: {"tutti.editSpeciesBatch.action.importMultiPost.help"}; + text: "tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies"; + toolTipText: "tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies.tip"; + i18nMnemonic: "tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies.mnemonic"; + _applicationAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions.ImportMultiPostSpeciesOnlyFrequenciesAction.class}; + _help: {"tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies.help"}; +} + +#importMultiPostOnlyIndividualObservationsButton { + actionIcon: import; + text: "tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations"; + toolTipText: "tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations.tip"; + i18nMnemonic: "tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations.mnemonic"; + _applicationAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions.ImportMultiPostSpeciesOnlyIndividualObservationsAction.class}; + _help: {"tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations.help"}; +} + +#exportMultiPostFullButton { + actionIcon: export; + text: "tutti.editSpeciesBatch.action.exportMultiPostFull"; + toolTipText: "tutti.editSpeciesBatch.action.exportMultiPostFull.tip"; + i18nMnemonic: "tutti.editSpeciesBatch.action.exportMultiPostFull.mnemonic"; + _applicationAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions.ExportMultiPostSpeciesFullAction.class}; + _help: {"tutti.editSpeciesBatch.action.exportMultiPostFull.help"}; +} + +#exportMultiPostOnlyFrequenciesButton { + actionIcon: export; + text: "tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies"; + toolTipText: "tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies.tip"; + i18nMnemonic: "tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies.mnemonic"; + _applicationAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions.ExportMultiPostSpeciesOnlyFrequenciesAction.class}; + _help: {"tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies.help"}; } -#exportMultiPostButton { +#exportMultiPostOnlyIndividualObservationsButton { actionIcon: export; - text: "tutti.editSpeciesBatch.action.exportMultiPost"; - toolTipText: "tutti.editSpeciesBatch.action.exportMultiPost.tip"; - i18nMnemonic: "tutti.editSpeciesBatch.action.exportMultiPost.mnemonic"; - _applicationAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions.ExportMultiPostSpeciesAction.class}; - _help: {"tutti.editSpeciesBatch.action.exportMultiPost.help"}; + text: "tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations"; + toolTipText: "tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations.tip"; + i18nMnemonic: "tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations.mnemonic"; + _applicationAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions.ExportMultiPostSpeciesOnlyIndividualObservationsAction.class}; + _help: {"tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations.help"}; } #filterSpeciesBatchAllButton { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ExportMultiPostSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ExportMultiPostSpeciesFullAction.java similarity index 77% copy from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ExportMultiPostSpeciesAction.java copy to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ExportMultiPostSpeciesFullAction.java index 134d3bb..0d31ffd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ExportMultiPostSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ExportMultiPostSpeciesFullAction.java @@ -37,41 +37,41 @@ import static org.nuiton.i18n.I18n.t; * @author Kevin Morin - kmorin@codelutin.com * @since 2.2 */ -public class ExportMultiPostSpeciesAction extends ExportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { +public class ExportMultiPostSpeciesFullAction extends ExportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { - public ExportMultiPostSpeciesAction(SpeciesBatchUIHandler handler) { + public ExportMultiPostSpeciesFullAction(SpeciesBatchUIHandler handler) { super(handler); } @Override protected String getFileExtension() { - return "tuttiSpecies"; + return "tuttiSpeciesFull"; } @Override protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpecies"); + return t("tutti.common.file.tuttiSpeciesFull"); } @Override protected String getFileChooserTitle() { - return t("tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.title"); + return t("tutti.editSpeciesBatch.action.exportMultiPostFull.destinationFile.title"); } @Override protected String getFileChooserButton() { - return t("tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.button"); + return t("tutti.editSpeciesBatch.action.exportMultiPostFull.destinationFile.button"); } @Override protected String getSuccessMessage(File file) { - return t("tutti.editSpeciesBatch.action.exportMultiPost.success", file); + return t("tutti.editSpeciesBatch.action.exportMultiPostFull.success", file); } @Override protected void doExport(MultiPostExportService multiPostImportExportService, File file, FishingOperation fishingOperation) { - multiPostImportExportService.exportSpecies(file, fishingOperation); + multiPostImportExportService.exportSpecies(file, fishingOperation, true, true); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ExportMultiPostSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java similarity index 74% copy from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ExportMultiPostSpeciesAction.java copy to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java index 134d3bb..dcf17f1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ExportMultiPostSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java @@ -37,41 +37,41 @@ import static org.nuiton.i18n.I18n.t; * @author Kevin Morin - kmorin@codelutin.com * @since 2.2 */ -public class ExportMultiPostSpeciesAction extends ExportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { +public class ExportMultiPostSpeciesOnlyFrequenciesAction extends ExportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { - public ExportMultiPostSpeciesAction(SpeciesBatchUIHandler handler) { + public ExportMultiPostSpeciesOnlyFrequenciesAction(SpeciesBatchUIHandler handler) { super(handler); } @Override protected String getFileExtension() { - return "tuttiSpecies"; + return "tuttiSpeciesOnlyFrequencies"; } @Override protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpecies"); + return t("tutti.common.file.tuttiSpeciesOnlyFrequencies"); } @Override protected String getFileChooserTitle() { - return t("tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.title"); + return t("tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies.destinationFile.title"); } @Override protected String getFileChooserButton() { - return t("tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.button"); + return t("tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies.destinationFile.button"); } @Override protected String getSuccessMessage(File file) { - return t("tutti.editSpeciesBatch.action.exportMultiPost.success", file); + return t("tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies.success", file); } @Override protected void doExport(MultiPostExportService multiPostImportExportService, File file, FishingOperation fishingOperation) { - multiPostImportExportService.exportSpecies(file, fishingOperation); + multiPostImportExportService.exportSpecies(file, fishingOperation, true, false); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ExportMultiPostSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java similarity index 72% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ExportMultiPostSpeciesAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java index 134d3bb..0570e07 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ExportMultiPostSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java @@ -37,41 +37,41 @@ import static org.nuiton.i18n.I18n.t; * @author Kevin Morin - kmorin@codelutin.com * @since 2.2 */ -public class ExportMultiPostSpeciesAction extends ExportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { +public class ExportMultiPostSpeciesOnlyIndividualObservationsAction extends ExportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { - public ExportMultiPostSpeciesAction(SpeciesBatchUIHandler handler) { + public ExportMultiPostSpeciesOnlyIndividualObservationsAction(SpeciesBatchUIHandler handler) { super(handler); } @Override protected String getFileExtension() { - return "tuttiSpecies"; + return "tuttiSpeciesOnlyIndividualObservations"; } @Override protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpecies"); + return t("tutti.common.file.tuttiSpeciesOnlyIndividualObservations"); } @Override protected String getFileChooserTitle() { - return t("tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.title"); + return t("tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations.destinationFile.title"); } @Override protected String getFileChooserButton() { - return t("tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.button"); + return t("tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations.destinationFile.button"); } @Override protected String getSuccessMessage(File file) { - return t("tutti.editSpeciesBatch.action.exportMultiPost.success", file); + return t("tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations.success", file); } @Override protected void doExport(MultiPostExportService multiPostImportExportService, File file, FishingOperation fishingOperation) { - multiPostImportExportService.exportSpecies(file, fishingOperation); + multiPostImportExportService.exportSpecies(file, fishingOperation, false, true); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesFullAction.java similarity index 90% copy from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesAction.java copy to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesFullAction.java index 27439a5..21aecdd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesFullAction.java @@ -43,25 +43,25 @@ import static org.nuiton.i18n.I18n.t; * @author Kevin Morin - kmorin@codelutin.com * @since 2.2 */ -public class ImportMultiPostSpeciesAction extends ImportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { +public class ImportMultiPostSpeciesFullAction extends ImportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { - public ImportMultiPostSpeciesAction(SpeciesBatchUIHandler handler) { + public ImportMultiPostSpeciesFullAction(SpeciesBatchUIHandler handler) { super(handler); } @Override protected String getFileExtension() { - return "tuttiSpecies"; + return "tuttiSpeciesFull"; } @Override protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpecies"); + return t("tutti.common.file.tuttiSpeciesFull"); } @Override protected String getFileChooserTitle() { - return t("tutti.editSpeciesBatch.action.importMultiPost.sourceFile.title"); + return t("tutti.editSpeciesBatch.action.importMultiPostFull.sourceFile.title"); } @Override @@ -77,7 +77,7 @@ public class ImportMultiPostSpeciesAction extends ImportMultiPostActionSupport<S @Override protected Map<String, Object> importBatches(MultiPostImportService multiPostImportExportService, File file, FishingOperation operation) { - return multiPostImportExportService.importSpecies(file, operation); + return multiPostImportExportService.importSpecies(file, operation, true, true); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java similarity index 84% copy from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesAction.java copy to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java index 27439a5..2798ed0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java @@ -43,41 +43,41 @@ import static org.nuiton.i18n.I18n.t; * @author Kevin Morin - kmorin@codelutin.com * @since 2.2 */ -public class ImportMultiPostSpeciesAction extends ImportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { +public class ImportMultiPostSpeciesOnlyFrequenciesAction extends ImportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { - public ImportMultiPostSpeciesAction(SpeciesBatchUIHandler handler) { + public ImportMultiPostSpeciesOnlyFrequenciesAction(SpeciesBatchUIHandler handler) { super(handler); } @Override protected String getFileExtension() { - return "tuttiSpecies"; + return "tuttiSpeciesOnlyFrequencies"; } @Override protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpecies"); + return t("tutti.common.file.tuttiSpeciesOnlyFrequencies"); } @Override protected String getFileChooserTitle() { - return t("tutti.editSpeciesBatch.action.importMultiPost.sourceFile.title"); + return t("tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies.sourceFile.title"); } @Override protected String getFileChooserButton() { - return t("tutti.editSpeciesBatch.action.importMultiPost.sourceFile.button"); + return t("tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies.sourceFile.button"); } @Override protected String getSuccessMessage(File file) { - return t("tutti.editSpeciesBatch.action.importMultiPost.success", file); + return t("tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies.success", file); } @Override protected Map<String, Object> importBatches(MultiPostImportService multiPostImportExportService, File file, FishingOperation operation) { - return multiPostImportExportService.importSpecies(file, operation); + return multiPostImportExportService.importSpecies(file, operation, true, false); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java similarity index 83% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesAction.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java index 27439a5..36161df 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java @@ -43,41 +43,41 @@ import static org.nuiton.i18n.I18n.t; * @author Kevin Morin - kmorin@codelutin.com * @since 2.2 */ -public class ImportMultiPostSpeciesAction extends ImportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { +public class ImportMultiPostSpeciesOnlyIndividualObservationsAction extends ImportMultiPostActionSupport<SpeciesBatchUIModel, SpeciesBatchUI, SpeciesBatchUIHandler> { - public ImportMultiPostSpeciesAction(SpeciesBatchUIHandler handler) { + public ImportMultiPostSpeciesOnlyIndividualObservationsAction(SpeciesBatchUIHandler handler) { super(handler); } @Override protected String getFileExtension() { - return "tuttiSpecies"; + return "tuttiSpeciesOnlyIndividualObservations"; } @Override protected String getFileExtensionDescription() { - return t("tutti.common.file.tuttiSpecies"); + return t("tutti.common.file.tuttiSpeciesOnlyIndividualObservations"); } @Override protected String getFileChooserTitle() { - return t("tutti.editSpeciesBatch.action.importMultiPost.sourceFile.title"); + return t("tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations.sourceFile.title"); } @Override protected String getFileChooserButton() { - return t("tutti.editSpeciesBatch.action.importMultiPost.sourceFile.button"); + return t("tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations.sourceFile.button"); } @Override protected String getSuccessMessage(File file) { - return t("tutti.editSpeciesBatch.action.importMultiPost.success", file); + return t("tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations.success", file); } @Override protected Map<String, Object> importBatches(MultiPostImportService multiPostImportExportService, File file, FishingOperation operation) { - return multiPostImportExportService.importSpecies(file, operation); + return multiPostImportExportService.importSpecies(file, operation, false, true); } 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 69528c3..0857a7f 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 @@ -120,6 +120,9 @@ tutti.common.file.tuttiCatch= tutti.common.file.tuttiIndividualObservation= tutti.common.file.tuttiMarineLitter= tutti.common.file.tuttiSpecies= +tutti.common.file.tuttiSpeciesFull= +tutti.common.file.tuttiSpeciesOnlyFrequencies= +tutti.common.file.tuttiSpeciesOnlyIndividualObservations= tutti.common.file.zip= tutti.common.referential.gear=Gear tutti.common.referential.person=Personutilisateur @@ -1315,6 +1318,24 @@ tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.title= tutti.editSpeciesBatch.action.exportMultiPost.mnemonic= tutti.editSpeciesBatch.action.exportMultiPost.success= tutti.editSpeciesBatch.action.exportMultiPost.tip= +tutti.editSpeciesBatch.action.exportMultiPostFull= +tutti.editSpeciesBatch.action.exportMultiPostFull.destinationFile.button= +tutti.editSpeciesBatch.action.exportMultiPostFull.destinationFile.title= +tutti.editSpeciesBatch.action.exportMultiPostFull.mnemonic= +tutti.editSpeciesBatch.action.exportMultiPostFull.success= +tutti.editSpeciesBatch.action.exportMultiPostFull.tip= +tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies= +tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies.destinationFile.button= +tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies.destinationFile.title= +tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies.mnemonic= +tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies.success= +tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies.tip= +tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations= +tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations.destinationFile.button= +tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations.destinationFile.title= +tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations.mnemonic= +tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations.success= +tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations.tip= tutti.editSpeciesBatch.action.ichtyometer= tutti.editSpeciesBatch.action.ichtyometer.mnemonic= tutti.editSpeciesBatch.action.ichtyometer.tip= @@ -1336,6 +1357,22 @@ tutti.editSpeciesBatch.action.importMultiPost.sourceFile.button= tutti.editSpeciesBatch.action.importMultiPost.sourceFile.title= tutti.editSpeciesBatch.action.importMultiPost.success= tutti.editSpeciesBatch.action.importMultiPost.tip= +tutti.editSpeciesBatch.action.importMultiPostFull= +tutti.editSpeciesBatch.action.importMultiPostFull.mnemonic= +tutti.editSpeciesBatch.action.importMultiPostFull.sourceFile.title= +tutti.editSpeciesBatch.action.importMultiPostFull.tip= +tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies= +tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies.mnemonic= +tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies.sourceFile.button= +tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies.sourceFile.title= +tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies.success= +tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies.tip= +tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations= +tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations.mnemonic= +tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations.sourceFile.button= +tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations.sourceFile.title= +tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations.success= +tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations.tip= tutti.editSpeciesBatch.action.importPsion= tutti.editSpeciesBatch.action.importPsion.existingData.help= tutti.editSpeciesBatch.action.importPsion.existingData.message= @@ -2357,6 +2394,12 @@ tutti.todo= tutti.toolbar.menu.action= tutti.toolbar.menu.action.mnemonic= tutti.toolbar.menu.action.tip= +tutti.toolbar.menuExportMultiPost.action= +tutti.toolbar.menuExportMultiPost.action.mnemonic= +tutti.toolbar.menuExportMultiPost.action.tip= +tutti.toolbar.menuImportMultiPost.action= +tutti.toolbar.menuImportMultiPost.action.mnemonic= +tutti.toolbar.menuImportMultiPost.action.tip= tutti.ui.change.species.decorator= tutti.update.db= tutti.update.error.with.auth= 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 732bc5c..540ca1c 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 @@ -91,9 +91,11 @@ tutti.common.file.protocol=Extension d'un fichier de protocole Allegro Campagne tutti.common.file.tuttiAccidental=Fichier d'import/export des lots de captures accidentelles tutti.common.file.tuttiBenthos=Fichier d'import/export des lots de benthos tutti.common.file.tuttiCatch=Fichier d'import/export des poids de capture -tutti.common.file.tuttiIndividualObservation=Fichier d'import/export des lots d'observations individuelles tutti.common.file.tuttiMarineLitter=Fichier d'import/export des lots de déchets -tutti.common.file.tuttiSpecies=Fichier d'import/export des lots d'espèces +tutti.common.file.tuttiSpecies= +tutti.common.file.tuttiSpeciesFull=Fichier d'import/export des lots d'espèces (mensurations et observations individuelles) +tutti.common.file.tuttiSpeciesOnlyFrequencies=Fichier d'import/export des lots d'espèces avec uniquement les mensurations +tutti.common.file.tuttiSpeciesOnlyIndividualObservations=Fichier d'import/export des lots d'espèces avec uniquement les observations individuelles tutti.common.file.zip=Fichier zip tutti.common.referential.gear=Engin tutti.common.referential.person=utilisateur @@ -1233,12 +1235,24 @@ tutti.editSpeciesBatch.action.doNotShowReport=Continuer tutti.editSpeciesBatch.action.editFrequencies=Mensurations tutti.editSpeciesBatch.action.editFrequencies.mnemonic=M tutti.editSpeciesBatch.action.editFrequencies.tip=Éditer les mensurations -tutti.editSpeciesBatch.action.exportMultiPost=Exporter les lots d'espèces -tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.button=Exporter -tutti.editSpeciesBatch.action.exportMultiPost.destinationFile.title=Exporter les lots d'espèces -tutti.editSpeciesBatch.action.exportMultiPost.mnemonic=E -tutti.editSpeciesBatch.action.exportMultiPost.success=Les lots d'espèces ont été exportés dans le fichier %s -tutti.editSpeciesBatch.action.exportMultiPost.tip=Exporter les lots d'espèces pour les importer sur le poste maître +tutti.editSpeciesBatch.action.exportMultiPostFull=Lots d'espèces, mensurations et observations individuelles +tutti.editSpeciesBatch.action.exportMultiPostFull.destinationFile.button=Exporter +tutti.editSpeciesBatch.action.exportMultiPostFull.destinationFile.title=Exporter les lots d'espèces, mensurations et observations individuelles +tutti.editSpeciesBatch.action.exportMultiPostFull.mnemonic=F +tutti.editSpeciesBatch.action.exportMultiPostFull.success=Les lots d'espèces ont été exportés dans le fichier %s +tutti.editSpeciesBatch.action.exportMultiPostFull.tip=Exporter les lots d'espèces, mensurations et observations individuelles pour les importer sur le poste maître +tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies=Les lots d'espèces et mensurations +tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies.destinationFile.button=Exporter +tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies.destinationFile.title=Exporter les lots d'espèces et mensurations +tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies.mnemonic=M +tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies.success=Les lots d'espèces et mensurations ont été exportés dans le fichier %s +tutti.editSpeciesBatch.action.exportMultiPostOnlyFrequencies.tip=Exporter les lots d'espèces et mensurations pour les importer sur le poste maître +tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations=Lots d'espèces et observations individuelles +tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations.destinationFile.button=Exporter +tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations.destinationFile.title=Exporter les lots d'espèces et observations individuelles +tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations.mnemonic=O +tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations.success=Les lots d'espèces et observations individuelles ont été exportés dans le fichier %s +tutti.editSpeciesBatch.action.exportMultiPostOnlyIndividualObservations.tip=Exporter les lots d'espèces et les observations individuelles pour les importer sur le poste maître tutti.editSpeciesBatch.action.importBigfin=Import Bigfin tutti.editSpeciesBatch.action.importBigfin.errors.fishingOperation=L'import Bigfin a été réalisé, mais des erreurs ont été détectées \:<ul>%s</ul><br/> tutti.editSpeciesBatch.action.importBigfin.errors.fishingOperation.title=Import Bigfin @@ -1248,12 +1262,24 @@ tutti.editSpeciesBatch.action.importBigfin.fatal.fishingOperation.title=Import B tutti.editSpeciesBatch.action.importBigfin.mnemonic=B tutti.editSpeciesBatch.action.importBigfin.success=Import Bigfin réussi \: %1s mensurations importées, %2s mensurations supprimées tutti.editSpeciesBatch.action.importBigfin.tip=Import Bigfin -tutti.editSpeciesBatch.action.importMultiPost=Importer des lots d'espèces -tutti.editSpeciesBatch.action.importMultiPost.mnemonic=I -tutti.editSpeciesBatch.action.importMultiPost.sourceFile.button=Importer -tutti.editSpeciesBatch.action.importMultiPost.sourceFile.title=Importer des lots d'espèces -tutti.editSpeciesBatch.action.importMultiPost.success=Des lots d'espèces ont été importés depuis le fichier %s -tutti.editSpeciesBatch.action.importMultiPost.tip=Importer des lots d'espèces créés sur un poste satellite +tutti.editSpeciesBatch.action.importMultiPostFull=Lots d'espèces, mensurations et observations individuelles +tutti.editSpeciesBatch.action.importMultiPostFull.mnemonic=F +tutti.editSpeciesBatch.action.importMultiPostFull.sourceFile.button=Importer +tutti.editSpeciesBatch.action.importMultiPostFull.sourceFile.title=Importer des lots d'espèces, mensurations et observations individuelles +tutti.editSpeciesBatch.action.importMultiPostFull.success=Des lots d'espèces, mensurations et observations individuelles ont été importés depuis le fichier %s +tutti.editSpeciesBatch.action.importMultiPostFull.tip=Importer des lots d'espèces, mensurations et observations individuelles créés sur un poste satellite +tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies=Lots d'espèces et mensurations +tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies.mnemonic=M +tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies.sourceFile.button=Importer +tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies.sourceFile.title=Importer des lots d'espèces et des mensurations +tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies.success=Des lots d'espèces et mensurations ont été importés depuis le fichier %s +tutti.editSpeciesBatch.action.importMultiPostOnlyFrequencies.tip=Importer des lots d'espèces et des mensurations créés sur un poste satellite +tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations=Lot espèces et observations individuelles +tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations.mnemonic=O +tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations.sourceFile.button=Importer +tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations.sourceFile.title=Importer des lots d'espèces et des observations individuelles +tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations.success=Des lots d'espèces et observations individuelles ont été importés depuis le fichier %s +tutti.editSpeciesBatch.action.importMultiPostOnlyIndividualObservations.tip=Importer des lots d'espèces et des observations individuelles créés sur un poste satellite tutti.editSpeciesBatch.action.importPsion=Import Psion tutti.editSpeciesBatch.action.importPsion.existingData.help=Que voulez-vous faire ?<ul><li><strong>Annuler</strong> pour ne pas importer les données Pupitri et conserver les espèces saisies</li><li><strong>OK</strong> pour supprimer les espèces existantes et les remplacer par les données de Pupitri</li></ul> tutti.editSpeciesBatch.action.importPsion.existingData.message=Des espèces ont déjà été saisies dans la capture. Si vous continuez, elles vont être écrasées. @@ -2161,6 +2187,12 @@ tutti.todo= tutti.toolbar.menu.action=Actions tutti.toolbar.menu.action.mnemonic=A tutti.toolbar.menu.action.tip=Actions possibles pour cet onglet +tutti.toolbar.menuExportMultiPost.action=Export multi-postes +tutti.toolbar.menuExportMultiPost.action.mnemonic=E +tutti.toolbar.menuExportMultiPost.action.tip=Exporter des lots espèces +tutti.toolbar.menuImportMultiPost.action=Import multi-postes +tutti.toolbar.menuImportMultiPost.action.mnemonic=I +tutti.toolbar.menuImportMultiPost.action.tip=Import des lots espèces tutti.ui.change.species.decorator=Changer la décoration tutti.update.db=Base de données tutti.update.error.with.auth=Impossible de télécharger la mise à jour du module <strong>%s</strong>.<br/>Le login / mot de passe que vous avez saisis n'étaient peut-être pas corrects.<br/>Si le problème persiste, veuillez consulter l'administrateur. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.