March 2016 - Tutti-commits - mailman.cloud.codelutin.com

branch release/4.5-rc-2 deleted (was e99f485)
by codelutin.com scm 31 Mar '16

31 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-rc-2 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git was e99f485 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-2' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

annotated tag tutti-4.5-rc-2 created (now 1b898a0)
by codelutin.com scm 31 Mar '16

31 Mar '16

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-4.5-rc-2 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 1b898a0 (tag) tagging c90d8095c86bcb671e10e0f61dacc1318155d57f (commit) replaces tutti-4.5-beta-2 tagged by Maven Release on Thu Mar 31 20:36:29 2016 +0200 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 4.5-rc-2 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (effa1a7 -> 192d0b5)
by codelutin.com scm 31 Mar '16

31 Mar '16

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 effa1a7 livrable #8199 Merge branch 'feature/8199' into develop new d66aa48 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds d907f136 [jgitflow-maven-plugin]updating poms for 4.5-rc-2 branch with snapshot versions new da40dc2 add missing license headers new ee32ce1 Mise à jour de la procédure de release new e99f485 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-2' with non-snapshot versions new c90d809 [jgitflow-maven-plugin]merging 'release/4.5-rc-2' into 'master' new 7e23887 [jgitflow-maven-plugin]merging 'master' into 'develop' new 192d0b5 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 7 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 192d0b539379a03ec3dfc3dd660f88ea129b1a73 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 31 20:36:31 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 7e23887fe983836b2f03fd77e1b1bbf85b2cc2f3 Merge: d66aa48 c90d809 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 31 20:36:31 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit d66aa48dc51316127e17d0c28f5e248fd061a9cc Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 31 20:36:30 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit c90d8095c86bcb671e10e0f61dacc1318155d57f Merge: 4011d57 e99f485 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 31 20:36:29 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5-rc-2' into 'master' commit e99f485ef7e2f5a959f53cd8d3382f95fef34401 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 31 20:33:52 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-2' with non-snapshot versions commit ee32ce16dd6be1746937f7f8276b69184777b98d Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 31 20:33:42 2016 +0200 Mise à jour de la procédure de release commit da40dc26a20e3a69d8f61b9015d9ceb1e08e3867 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 31 20:33:00 2016 +0200 add missing license headers Summary of changes: README.md | 7 ------- .../catches/multipost/MultiPostImportResult.java | 24 ++++++++++++++++++++++ .../tutti/service/sampling/SamplingCodePrefix.java | 24 ++++++++++++++++++++++ .../tutti/ui/swing/util/WideDataComboBoxUI.java | 24 ++++++++++++++++++++++ 4 files changed, 72 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 7

branch release/4.5-rc-2 updated (d907f136 -> e99f485)
by codelutin.com scm 31 Mar '16

31 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-rc-2 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from d907f136 [jgitflow-maven-plugin]updating poms for 4.5-rc-2 branch with snapshot versions adds da40dc2 add missing license headers adds ee32ce1 Mise à jour de la procédure de release adds e99f485 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-2' with non-snapshot versions No new revisions were added by this update. Summary of changes: README.md | 7 ------- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../catches/multipost/MultiPostImportResult.java | 24 ++++++++++++++++++++++ .../tutti/service/sampling/SamplingCodePrefix.java | 24 ++++++++++++++++++++++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../tutti/ui/swing/util/WideDataComboBoxUI.java | 24 ++++++++++++++++++++++ 11 files changed, 79 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master updated (4011d57 -> c90d809)
by codelutin.com scm 31 Mar '16

31 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 4011d57 [jgitflow-maven-plugin]merging 'release/4.5-beta-2' into 'master' adds 75cf42c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 0ac0949 [jgitflow-maven-plugin]merging 'master' into 'develop' adds ec4489e [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 45df461 fix command adds 4b9485a ajout d'un renderer de poids qui affiche le bon nombre de decimales (fixes #8151) adds 4f97152 on arrondit après le calcul rtp (see #8151) adds faac160 N'ajouter dans le cache des échantillons uniquement ceux qui ont une taille adds 4583d5a Oups encore du refactor sur le réusinage Species/Benthos adds f7f8bf9 on arrondit avant la comparaison (refs #8151) adds 4619e29 Fixes #8151 Merge branch 'feature/8151' into develop adds 9ed3662 correction du redimensionnement (fixes #8162) adds 17ba06f livrable #8162 Merge branch 'feature/8162' into develop adds 379048b correction de la conversion gramme -> unité de la conf (fixes #8189) adds eacf9aa Amélioration javadoc adds 3051429 Ajout d'une nouvelle méthode de conversion qui semble fonctionner adds 563c3b6 Amélioration de la méthode de convertion adds 68fe8e2 Merge branch 'feature/8189' into 'develop' adds bfbdf45 suppression du separateur de la conf, sinon on ne peut pas récupérer les ids des précédents code si le séparateur change (enfin on pourrait mais c'est plus compliqué) (refs #8192) adds dadc607 utilisation d'un objet pour gérer le code de prélèvement (fixes #8192) adds 9e9dbf7 livrable #8192 Merge branch 'feature/8192' into develop adds 189803c l'arrondi du poids rendait le poids négatif positif... d'où le poids total qui ne faisait qu'augmenter (fixes #8146) adds c03c492 fix merge adds 8edb8bd livrable #8146 Merge branch 'feature/8146' into develop adds ffb26da ajout des colonnes de code campagne et de nom scientifique (fixes #8164) adds 3e74e9f livrable #8164 Merge branch 'feature/8164' into develop adds 26554ce ajout de la colonen sexe, même si elle n'est pas dans le protocole (fixes #8191) adds ff2ad98 livrable #8191 Merge branch 'feature/8191' into develop adds 9fb2cd5 on increment et decremente l'algo à partir du moment où il y a une taille (fixes #8194) adds dbaf1ea livrable #8194 Merge branch 'feature/8194' into develop adds 8246fab on déclenche un évènement quand le résumé est mis à jour (refs #8152) adds cff4876 on ajoute le nombre de prélèvement par clé (espece/taille/maturité/sexe) (refs #8152) adds 179a761 gestion des prélèvements dans le cache (refs #8152 refs #8177) adds 3e3c3fa gestion des prélèvements + affichage des prélèvements réels (refs #8177 refs #8152) adds 6611c70 décoration pour le résumé (refs #8152) adds 10d8c6a augmentation de la taille des messages de prélèvement + limite infinie au lieu de nulle (fixes #8152) adds 3be764d fix merge adds 4ae7280 livrable #8177 #8179 #8152 Merge branch 'feature/8177' into develop adds 35ae2c4 recopie de la maturité et du sexe de la dernière ligne créée quand on ajoute une ligne d'observations (fixes #8198) adds 681dc4f livrable #8198 Merge branch 'feature/8198' into develop adds bba4285 ajout du code de prélèvement et du mode de recopie pour l'import export (refs #8153) adds e61c8c5 on n'enregistre pas les lignes importées, on les retourne à l'utilisateur (refs #8153) adds 879dea2 on recharge les lignes ) partir du résultat de l'import (fixes #8153) adds e64da66 Remove strange comment adds 39cffa5 Do not import empty SamplingCode adds 8748f39 Fix merge adds 18011f5 livrable #8153 Merge branch 'feature/8153' into develop adds 9488922 Demander de sauvegarder avant l'export multi-poste si des modifications sur le modèle (Fixes #8199) adds effa1a7 livrable #8199 Merge branch 'feature/8199' into develop adds d907f136 [jgitflow-maven-plugin]updating poms for 4.5-rc-2 branch with snapshot versions adds da40dc2 add missing license headers adds ee32ce1 Mise à jour de la procédure de release adds e99f485 [jgitflow-maven-plugin]updating poms for branch'release/4.5-rc-2' with non-snapshot versions adds c90d809 [jgitflow-maven-plugin]merging 'release/4.5-rc-2' into 'master' No new revisions were added by this update. Summary of changes: README.md | 7 - pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 4 - .../fr/ifremer/tutti/TuttiConfigurationOption.java | 8 - .../persistence/entities/CaracteristicMap.java | 2 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 6 - .../main/java/fr/ifremer/tutti/util/Weights.java | 72 ++- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/DecoratorService.java | 2 + .../ifremer/tutti/service/PersistenceService.java | 4 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 128 ++--- .../service/catches/WeightComputingService.java | 10 +- .../catches/multipost/MultiPostExportContext.java | 4 +- .../catches/multipost/MultiPostImportResult.java | 60 ++ .../catches/multipost/MultiPostImportService.java | 100 +++- .../multipost/csv/IndividualObservationRow.java | 42 +- .../csv/IndividualObservationRowModel.java | 5 + .../protocol/CalcifiedPiecesSamplingRow.java | 6 + .../protocol/CalcifiedPiecesSamplingRowModel.java | 29 +- .../service/pupitri/PupitriImportService.java | 2 +- .../CruiseSamplingCache.java | 258 +++++++-- .../CruiseSamplingCacheLoader.java | 4 +- .../CruiseSamplingInternalCache.java | 100 +++- .../tutti/service/sampling/SamplingCodePrefix.java | 78 +++ .../{samplingCache => sampling}/SamplingEvent.java | 37 +- .../SamplingListener.java | 3 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../content/actions/EditCatchesSupportAction.java | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 3 - .../actions/ExportMultiPostActionSupport.java | 95 ++-- .../IndividualObservationBatchRowModel.java | 43 +- .../IndividualObservationBatchTableModel.java | 51 +- .../SampleCodeEditionPopupUI.jaxx | 4 +- .../SampleCodeEditionPopupUI.jcss | 2 +- .../SampleCodeEditionPopupUIHandler.java | 3 +- .../SampleCodeEditionPopupUIModel.java | 7 +- .../SamplingCodeCellEditor.java | 4 +- .../catches/species/BenthosBatchUISupportImpl.java | 18 +- .../catches/species/SpeciesBatchUISupportImpl.java | 30 +- .../species/SpeciesOrBenthosBatchUISupport.java | 26 +- .../create/CreateSpeciesBatchUIHandler.java | 7 +- .../species/edit/SpeciesBatchUIHandler.java | 10 +- .../edit/actions/RenameSpeciesBatchAction.java | 7 +- .../frequency/IndividualObservationUICache.java | 179 ++++-- .../frequency/SpeciesFrequencyCellComponent.java | 9 +- .../frequency/SpeciesFrequencyRowModel.java | 23 +- .../frequency/SpeciesFrequencyTableModel.java | 40 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 20 +- .../species/frequency/SpeciesFrequencyUI.jcss | 7 +- .../frequency/SpeciesFrequencyUIHandler.java | 624 +++++++++++---------- .../species/frequency/SpeciesFrequencyUIModel.java | 15 +- .../frequency/actions/DeleteSampleCodeAction.java | 2 +- .../frequency/actions/EditSampleCodeAction.java | 6 +- .../ExportMultiPostSpeciesSupportAction.java | 42 +- .../ImportMultiPostSpeciesSupportAction.java | 87 ++- .../species/split/SplitSpeciesBatchUIHandler.java | 13 +- .../species/split/SplitSpeciesBatchUIModel.java | 17 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 15 +- .../tutti/ui/swing/util/WideDataComboBoxUI.java | 73 +++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 5 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 7 +- 65 files changed, 1721 insertions(+), 760 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportResult.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingCache.java (67%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingCacheLoader.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/CruiseSamplingInternalCache.java (58%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/sampling/SamplingCodePrefix.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/SamplingEvent.java (69%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/{samplingCache => sampling}/SamplingListener.java (91%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/WideDataComboBoxUI.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - Tutti 4.5-rc-2 released
by codelutin.com Release Notification 31 Mar '16

31 Mar '16

The Tutti team is pleased to announce the tutti-4.5-rc-2 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: http://tutti.codelutin.com Changes ------- No changes defined in this version. Downloads --------- For a manual installation, you can download files here: https://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-4.5-rc-2-tools.zip - https://forge.codelutin.com/attachments/download/3826 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

branch release/4.5-rc-2 created (now d907f136)
by codelutin.com scm 31 Mar '16

31 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch release/4.5-rc-2 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at d907f136 [jgitflow-maven-plugin]updating poms for 4.5-rc-2 branch with snapshot versions This branch includes the following new commits: new d907f136 [jgitflow-maven-plugin]updating poms for 4.5-rc-2 branch with snapshot versions 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 d907f13686d1300c08cc620c0bc85c1bf6f160b3 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 31 20:29:14 2016 +0200 [jgitflow-maven-plugin]updating poms for 4.5-rc-2 branch with snapshot versions -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (18011f5 -> effa1a7)
by codelutin.com scm 31 Mar '16

31 Mar '16

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 18011f5 livrable #8153 Merge branch 'feature/8153' into develop new 9488922 Demander de sauvegarder avant l'export multi-poste si des modifications sur le modèle (Fixes #8199) new effa1a7 livrable #8199 Merge branch 'feature/8199' into develop The 2 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 effa1a72c2fa917343ab436bdd69d73c9943b4a6 Merge: 18011f5 9488922 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 31 20:21:34 2016 +0200 livrable #8199 Merge branch 'feature/8199' into develop commit 9488922d6a8bb69b2d663682e4b8b365936e5854 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 31 20:21:30 2016 +0200 Demander de sauvegarder avant l'export multi-poste si des modifications sur le modèle (Fixes #8199) Summary of changes: .../actions/ExportMultiPostActionSupport.java | 95 ++++++++++++++-------- .../frequency/SpeciesFrequencyCellComponent.java | 9 +- .../ExportMultiPostSpeciesSupportAction.java | 42 +++++++++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 + 5 files changed, 115 insertions(+), 37 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

01/02: Demander de sauvegarder avant l'export multi-poste si des modifications sur le modèle (Fixes #8199)
by codelutin.com scm 31 Mar '16

31 Mar '16

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 9488922d6a8bb69b2d663682e4b8b365936e5854 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 31 20:21:30 2016 +0200 Demander de sauvegarder avant l'export multi-poste si des modifications sur le modèle (Fixes #8199) --- .../actions/ExportMultiPostActionSupport.java | 95 ++++++++++++++-------- .../frequency/SpeciesFrequencyCellComponent.java | 9 +- .../ExportMultiPostSpeciesSupportAction.java | 42 +++++++++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 + 5 files changed, 115 insertions(+), 37 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportMultiPostActionSupport.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportMultiPostActionSupport.java index 41fed1b..8e40b9c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportMultiPostActionSupport.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportMultiPostActionSupport.java @@ -26,11 +26,11 @@ import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.catches.multipost.MultiPostExportService; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import org.jdesktop.beans.AbstractBean; import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; @@ -49,7 +49,7 @@ public abstract class ExportMultiPostActionSupport<M extends AbstractBean, UI ex /** * Do save the catches before export. */ - private Boolean doSaveCatches; + private Boolean doSaveBeforeExport; /** * File to export. @@ -81,45 +81,63 @@ public abstract class ExportMultiPostActionSupport<M extends AbstractBean, UI ex return getUI().getParentContainer(EditCatchesUI.class); } - @Override - public final boolean prepareAction() throws Exception { + /** + * Demande si il faut sauvegarder les données de l'écran avant de lancer l'export. + * + * @return {@code null} si pas de sauvegarde à faire, + * {@code 0} si on doit effectuer la sauvegarde avant l'export, {@code 1} pour ne rien faire avant l'export, {@code 2} pour annuler l'action + * @since 4.5 + */ + protected Integer askToSaveBeforeExport() { - boolean doAction = super.prepareAction(); + EditCatchesUIModel model = getEditCatchUI().getModel(); - if (doAction) { + Integer doSaveBeforeExportResponse = null; - doSaveCatches = false; + boolean canSave = model.isModify() && model.isValid(); + if (canSave) { - EditCatchesUI catchesUI = getEditCatchUI(); - EditCatchesUIModel model = catchesUI.getModel(); + String htmlMessage = String.format( + AbstractApplicationUIHandler.CONFIRMATION_FORMAT, + t("tutti.askToSaveCatch.message"), + t("tutti.askToSaveCatchBeforeExport.help")); - fishingOperation = model.getFishingOperation(); + doSaveBeforeExportResponse = JOptionPane.showOptionDialog(getHandler().getTopestUI(), + htmlMessage, + t("tutti.askToSaveCatch.title"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE, + null, + new String[]{t("tutti.option.saveCatch"), t("tutti.option.notSaveCatch"), t("tutti.option.cancelExport")}, + t("tutti.option.saveCatch")); - boolean canSave = model.isModify() && model.isValid(); - // ask user to save before export (otherwise some data won't be exported) + } - if (canSave) { + return doSaveBeforeExportResponse; - String htmlMessage = String.format( - AbstractApplicationUIHandler.CONFIRMATION_FORMAT, - t("tutti.askToSaveCatch.message"), - t("tutti.askToSaveCatchBeforeExport.help")); + } - int saveResponse = JOptionPane.showOptionDialog(getHandler().getTopestUI(), - htmlMessage, - t("tutti.askToSaveCatch.title"), - JOptionPane.OK_CANCEL_OPTION, - JOptionPane.QUESTION_MESSAGE, - null, - new String[]{t("tutti.option.saveCatch"), t("tutti.option.notSaveCatch"), t("tutti.option.cancelExport")}, - t("tutti.option.saveCatch")); + @Override + public final boolean prepareAction() throws Exception { - switch (saveResponse) { + boolean doAction = super.prepareAction(); + + if (doAction) { + + fishingOperation = getEditCatchUI().getModel().getFishingOperation(); + + Integer doSaveBeforeExportResponse = askToSaveBeforeExport(); + + doSaveBeforeExport = false; + + if (doSaveBeforeExportResponse != null) { + + switch (doSaveBeforeExportResponse) { case 0: // should save - doSaveCatches = true; + doSaveBeforeExport = true; break; case 1: @@ -129,6 +147,7 @@ public abstract class ExportMultiPostActionSupport<M extends AbstractBean, UI ex // cancel import doAction = false; + break; } } @@ -155,21 +174,27 @@ public abstract class ExportMultiPostActionSupport<M extends AbstractBean, UI ex } + protected void saveBeforeExport() { + + getProgressionModel().increments("Sauvegarde de la capture"); + + // save catches before export + + EditCatchesUI catchesUI = getEditCatchUI(); + getActionEngine().runInternalAction(catchesUI.getHandler(), SaveCatchBatchAction.class); + + } + @Override public final void doAction() throws Exception { - if (doSaveCatches) { + if (doSaveBeforeExport) { setProgressionModel(new ProgressionModel()); ProgressionModel progressionModel = getProgressionModel(); progressionModel.setTotal(2); - progressionModel.increments("Sauvegarde de la capture"); - - // save catches before export - - EditCatchesUI catchesUI = getEditCatchUI(); - getActionEngine().runInternalAction(catchesUI.getHandler(), SaveCatchBatchAction.class); + saveBeforeExport(); progressionModel.increments("Lancement de l'export"); @@ -187,7 +212,7 @@ public abstract class ExportMultiPostActionSupport<M extends AbstractBean, UI ex public final void releaseAction() { file = null; fishingOperation = null; - doSaveCatches = null; + doSaveBeforeExport = null; super.releaseAction(); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java index 626774e..8c9d1c5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java @@ -221,7 +221,8 @@ public class SpeciesFrequencyCellComponent extends DefaultTableCellRenderer { parent.getHandler().editSpeciesFrequencies(this); } - public void save(SpeciesFrequencyUIModel frequencyModel, boolean quit) { + public void save(SpeciesFrequencyUIModel frequencyModel) { + if (frequencyModel.isValid()) { // at close, synch back frequencies @@ -286,6 +287,12 @@ public class SpeciesFrequencyCellComponent extends DefaultTableCellRenderer { ui.getHandler().updateTotalFromFrequencies(editRow); } + } + + public void save(SpeciesFrequencyUIModel frequencyModel, boolean quit) { + + save(frequencyModel); + if (quit) { int r = rowIndex; int c = columnIndex; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ExportMultiPostSpeciesSupportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ExportMultiPostSpeciesSupportAction.java index 2e4f379..40a2323 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ExportMultiPostSpeciesSupportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ExportMultiPostSpeciesSupportAction.java @@ -25,14 +25,18 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.ac import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.service.catches.multipost.MultiPostExportService; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.actions.ExportMultiPostActionSupport; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOrBenthosBatchUISupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUIModel; +import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; +import javax.swing.JOptionPane; import java.io.File; +import static org.nuiton.i18n.I18n.t; + /** * @author Tony Chemit - chemit(a)codelutin.com * @since 4.5 @@ -58,4 +62,40 @@ public abstract class ExportMultiPostSpeciesSupportAction extends ExportMultiPos } + @Override + protected Integer askToSaveBeforeExport() { + + SpeciesFrequencyUIModel model = getModel(); + + Integer doSaveBeforeExportResponse = null; + + boolean canSave = model.isModify() && model.isValid(); + if (canSave) { + + String htmlMessage = String.format( + AbstractApplicationUIHandler.CONFIRMATION_FORMAT, + t("tutti.askToSaveFrequenciesOrIndividualObservations.message"), + t("tutti.askToSaveFrequenciesOrIndividualObservations.help")); + + doSaveBeforeExportResponse = JOptionPane.showOptionDialog(getHandler().getTopestUI(), + htmlMessage, + t("tutti.askToSaveFrequenciesOrIndividualObservations.title"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE, + null, + new String[]{t("tutti.option.saveCatch"), t("tutti.option.notSaveCatch"), t("tutti.option.cancelExport")}, + t("tutti.option.saveCatch")); + + } + + return doSaveBeforeExportResponse; + + } + + @Override + protected void saveBeforeExport() { + + getHandler().getFrequencyEditor().save(getModel()); + + } } 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 518fe4c..e9c7a23 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 @@ -62,6 +62,9 @@ tutti.askToSaveCatch.message= tutti.askToSaveCatch.title= tutti.askToSaveCatchBeforeExport.help= tutti.askToSaveCatchBeforeImport.help= +tutti.askToSaveFrequenciesOrIndividualObservations.help= +tutti.askToSaveFrequenciesOrIndividualObservations.message= +tutti.askToSaveFrequenciesOrIndividualObservations.title= tutti.attachmentEditor.action= tutti.attachmentEditor.action.add.mnemonic= tutti.attachmentEditor.action.add.tip= 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 90e313d..867d16b 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 @@ -46,6 +46,9 @@ tutti.askToSaveCatch.message=Des modifications sur la capture ne sont pas enregi tutti.askToSaveCatch.title=Modifications non enregistrées sur la capture tutti.askToSaveCatchBeforeExport.help=Que voulez-vous faire ?<ul><li>Annuler l'export pour annuler l'opération d'export</li><li>Ne pas enregistrer les modifications pour réaliser l'export sur les données non modifiées</li><li>Enregistrer les modifications pour enregistrer les modifications puis réaliser l'export</li></ul> tutti.askToSaveCatchBeforeImport.help=Que voulez-vous faire ?<ul><li>Annuler l'import pour annuler l'opération d'import</li><li>Annuler les modifications pour annuler les modifications avant de réaliser l'import</li><li>Enregistrer les modifications pour enregistrer les modifications puis réaliser l'import</li></ul> +tutti.askToSaveFrequenciesOrIndividualObservations.help=Que voulez-vous faire ?<ul><li>Annuler l'export pour annuler l'opération d'export</li><li>Ne pas enregistrer les modifications pour réaliser l'export sur les données non modifiées</li><li>Enregistrer les modifications pour enregistrer les modifications puis réaliser l'export</li></ul> +tutti.askToSaveFrequenciesOrIndividualObservations.message=Des modifications ne sont pas enregistrées +tutti.askToSaveFrequenciesOrIndividualObservations.title=Modifications non enregistrées sur les mensurations ou observations individuelles tutti.attachmentEditor.action.add.mnemonic=A tutti.attachmentEditor.action.add.tip=Ajouter une pièce jointe tutti.attachmentEditor.action.closeAttachment.tip=Fermer la fenêtre des pièces-jointes -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (681dc4f -> 18011f5)
by codelutin.com scm 31 Mar '16

31 Mar '16

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 681dc4f livrable #8198 Merge branch 'feature/8198' into develop adds bba4285 ajout du code de prélèvement et du mode de recopie pour l'import export (refs #8153) adds e61c8c5 on n'enregistre pas les lignes importées, on les retourne à l'utilisateur (refs #8153) adds 879dea2 on recharge les lignes ) partir du résultat de l'import (fixes #8153) adds e64da66 Remove strange comment adds 39cffa5 Do not import empty SamplingCode adds 8748f39 Fix merge new 18011f5 livrable #8153 Merge branch 'feature/8153' into develop 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 18011f572900afee15e40a086273c59e53b910b6 Merge: 681dc4f 8748f39 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 31 18:04:57 2016 +0200 livrable #8153 Merge branch 'feature/8153' into develop Summary of changes: .../persistence/entities/CaracteristicMap.java | 2 +- .../catches/multipost/MultiPostExportContext.java | 4 +- .../catches/multipost/MultiPostImportResult.java | 36 ++ .../catches/multipost/MultiPostImportService.java | 100 ++++- .../multipost/csv/IndividualObservationRow.java | 42 +- .../csv/IndividualObservationRowModel.java | 5 + .../IndividualObservationBatchTableModel.java | 12 +- .../catches/species/BenthosBatchUISupportImpl.java | 3 +- .../catches/species/SpeciesBatchUISupportImpl.java | 3 +- .../species/SpeciesOrBenthosBatchUISupport.java | 3 +- .../frequency/SpeciesFrequencyUIHandler.java | 443 +++++++++++---------- .../species/frequency/SpeciesFrequencyUIModel.java | 8 + .../ImportMultiPostSpeciesSupportAction.java | 87 +++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 15 files changed, 463 insertions(+), 287 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportResult.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1