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

branch feature/8117 updated (4c8e90b -> 6b28b54)
by codelutin.com scm March 14, 2016

March 14, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8117 in repository tutti. See http://git.codelutin.com/tutti.git discards 4c8e90b mettre l'axe des y du graph poids moyens en gramme et préciser l'unité sur l'axe des x (fixes #8117) adds ea5bb50 on cherche la classe de taille dans les observations individuelles en plus des mensurations (au cas où il n'y ait pas de mensurations) adds 20120fd Bien calculer l'action corriger une espèce (See #8121) adds eebc867 renommage methode (refs #8121) adds 4a57b27 Merge branch 'feature/8121' into 'develop' adds 2960ff5 on ne prend pas en compte les caractéristiques par défaut pour chcker si une ligne est vide (fixes #8125) adds 4077f3c Fixes #8107 Merge branch 'feature/8107' into develop adds 6b28b54 mettre l'axe des y du graph poids moyens en gramme et préciser l'unité sur l'axe des x (fixes #8117) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (4c8e90b) \ N -- N -- N refs/heads/feature/8117 (6b28b54) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: .../persistence/entities/CaracteristicMap.java | 8 +++--- .../IndividualObservationBatchRowModel.java | 9 +++++-- .../IndividualObservationBatchTableModel.java | 3 +++ .../catches/species/SpeciesBatchRowModel.java | 17 +++++++++++++ .../catches/species/SpeciesBatchUIHandler.java | 8 +++++- .../frequency/SpeciesFrequencyUIHandler.java | 29 +++++++++++++--------- 6 files changed, 56 insertions(+), 18 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (4a57b27 -> 4077f3c)
by codelutin.com scm March 14, 2016

March 14, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 4a57b27 Merge branch 'feature/8121' into 'develop' new 2960ff5 on ne prend pas en compte les caractéristiques par défaut pour chcker si une ligne est vide (fixes #8125) new 4077f3c Fixes #8107 Merge branch 'feature/8107' 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 4077f3c324b60e9122d6542ace988ed610fb7fc0 Merge: 4a57b27 2960ff5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Mar 14 17:35:27 2016 +0100 Fixes #8107 Merge branch 'feature/8107' into develop commit 2960ff587c75926953aa9181c27656f188e14da9 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Mar 14 16:27:58 2016 +0100 on ne prend pas en compte les caractéristiques par défaut pour chcker si une ligne est vide (fixes #8125) Summary of changes: .../fr/ifremer/tutti/persistence/entities/CaracteristicMap.java | 8 +++++--- .../IndividualObservationBatchRowModel.java | 9 +++++++-- .../IndividualObservationBatchTableModel.java | 3 +++ 3 files changed, 15 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/8107 deleted (was a408b09)
by codelutin.com scm March 14, 2016

March 14, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8107 in repository tutti. See http://git.codelutin.com/tutti.git was a408b09 on ne prend pas en compte les caractéristiques par défaut pour chcker si une ligne est vide (fixes #8125) 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

branch feature/8107 updated (ff3e33e -> a408b09)
by codelutin.com scm March 14, 2016

March 14, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8107 in repository tutti. See http://git.codelutin.com/tutti.git discards ff3e33e on ne prend pas en compte les caractéristiques par défaut pour chcker si une ligne est vide (fixes #8125) adds bb7298d Ave Cesar... adds 6e7d6b8 On met tous les classes d'import/export csv dans un paquetage csv + import/export sur un lot (See #8119) adds 29caf78 réusinage actions d'import sur le trait adds 98fc416 Import/export au niveau d'un lot (See #8119) adds 6181678 Ajout avertissement avant import multi-poste si des données existent (See #8119) adds 18ce0bf Fixes #8119 Merge branch 'feature/8119' into develop adds efe7f4c option pour ne plus mettre de classe de taille par défaut sur les lignes de mensuration si c'est calculé (fixes #8056) adds 4fb61ce I18n adds 59d368b Fixes #8056 Merge branch 'feature/8056' into develop adds a408b09 on ne prend pas en compte les caractéristiques par défaut pour chcker si une ligne est vide (fixes #8125) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ff3e33e) \ N -- N -- N refs/heads/feature/8107 (a408b09) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: .../catches/multipost/MultiPostExportContext.java | 105 +++-- .../catches/multipost/MultiPostExportService.java | 161 ++++--- .../catches/multipost/MultiPostImportContext.java | 6 +- .../catches/multipost/MultiPostImportService.java | 481 +++++++++++++++++---- .../{ => csv}/AbstractFishingOperationRow.java | 2 +- .../AbstractFishingOperationRowModel.java | 12 +- .../multipost/{ => csv}/AccidentalCatchRow.java | 13 +- .../{ => csv}/AccidentalCatchRowModel.java | 28 +- .../catches/multipost/{ => csv}/AttachmentRow.java | 9 +- .../multipost/{ => csv}/AttachmentRowModel.java | 19 +- .../multipost/{ => csv}/CaracteristicRow.java | 8 +- .../multipost/{ => csv}/CaracteristicRowModel.java | 19 +- .../catches/multipost/{ => csv}/CatchBatchRow.java | 2 +- .../multipost/{ => csv}/CatchBatchRowModel.java | 5 +- .../multipost/{ => csv}/CatchFrequencyRow.java | 22 +- .../{ => csv}/CatchFrequencyRowModel.java | 22 +- .../catches/multipost/{ => csv}/CatchRow.java | 15 +- .../catches/multipost/{ => csv}/CatchRowModel.java | 21 +- .../multipost/{ => csv}/CatchWeightsRow.java | 2 +- .../multipost/{ => csv}/CatchWeightsRowModel.java | 5 +- .../multipost/{ => csv}/FishingOperationRow.java | 2 +- .../{ => csv}/FishingOperationRowModel.java | 6 +- .../{ => csv}/IndividualObservationRow.java | 14 +- .../{ => csv}/IndividualObservationRowModel.java | 19 +- .../multipost/{ => csv}/MarineLitterRow.java | 11 +- .../multipost/{ => csv}/MarineLitterRowModel.java | 19 +- .../multipost/{ => csv}/MarineLitterWeightRow.java | 2 +- .../{ => csv}/MarineLitterWeightRowModel.java | 5 +- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 1 + .../filtered-resources/tutti-help-fr.properties | 31 +- .../content/operation/catches/EditCatchesUI.jcss | 4 + .../operation/catches/EditCatchesUIHandler.java | 3 +- .../actions/ImportMultiPostActionSupport.java | 2 +- .../catches/species/SpeciesBatchRowModel.java | 22 +- .../actions/ExportMultiPostSpeciesFullAction.java | 4 +- ...xportMultiPostSpeciesOnlyFrequenciesAction.java | 4 +- ...ostSpeciesOnlyIndividualObservationsAction.java | 4 +- .../actions/ImportMultiPostSpeciesFullAction.java | 62 +-- ...mportMultiPostSpeciesOnlyFrequenciesAction.java | 62 +-- ...ostSpeciesOnlyIndividualObservationsAction.java | 62 +-- ...va => ImportMultiPostSpeciesSupportAction.java} | 40 +- .../frequency/SpeciesFrequencyCellComponent.java | 2 +- .../frequency/SpeciesFrequencyTableModel.java | 6 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 17 + .../species/frequency/SpeciesFrequencyUI.jcss | 88 ++++ .../frequency/SpeciesFrequencyUIHandler.java | 15 +- .../actions/ExportMultiPostSpeciesFullAction.java | 30 +- ...xportMultiPostSpeciesOnlyFrequenciesAction.java | 30 +- ...ostSpeciesOnlyIndividualObservationsAction.java | 30 +- .../actions/ImportMultiPostSpeciesFullAction.java} | 44 +- ...portMultiPostSpeciesOnlyFrequenciesAction.java} | 44 +- ...stSpeciesOnlyIndividualObservationsAction.java} | 44 +- .../ImportMultiPostSpeciesSupportAction.java | 157 +++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 43 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 48 +- 56 files changed, 1264 insertions(+), 671 deletions(-) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AbstractFishingOperationRow.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AbstractFishingOperationRowModel.java (81%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AccidentalCatchRow.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AccidentalCatchRowModel.java (73%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AttachmentRow.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/AttachmentRowModel.java (81%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CaracteristicRow.java (96%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CaracteristicRowModel.java (77%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchBatchRow.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchBatchRowModel.java (93%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchFrequencyRow.java (87%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchFrequencyRowModel.java (70%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchRow.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchRowModel.java (83%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchWeightsRow.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/CatchWeightsRowModel.java (91%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/FishingOperationRow.java (94%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/FishingOperationRowModel.java (88%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/IndividualObservationRow.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/IndividualObservationRowModel.java (78%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/MarineLitterRow.java (97%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/MarineLitterRowModel.java (76%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/MarineLitterWeightRow.java (95%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/{ => csv}/MarineLitterWeightRowModel.java (90%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/{ImportMultiPostSpeciesFullAction.java => ImportMultiPostSpeciesSupportAction.java} (70%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => frequency}/actions/ExportMultiPostSpeciesFullAction.java (65%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => frequency}/actions/ExportMultiPostSpeciesOnlyFrequenciesAction.java (64%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ => frequency}/actions/ExportMultiPostSpeciesOnlyIndividualObservationsAction.java (64%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ExportMultiPostSpeciesFullAction.java => frequency/actions/ImportMultiPostSpeciesFullAction.java} (50%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ExportMultiPostSpeciesFullAction.java => frequency/actions/ImportMultiPostSpeciesOnlyFrequenciesAction.java} (50%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{actions/ExportMultiPostSpeciesFullAction.java => frequency/actions/ImportMultiPostSpeciesOnlyIndividualObservationsAction.java} (50%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ImportMultiPostSpeciesSupportAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (ea5bb50 -> 4a57b27)
by codelutin.com scm March 14, 2016

March 14, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from ea5bb50 on cherche la classe de taille dans les observations individuelles en plus des mensurations (au cas où il n'y ait pas de mensurations) adds 20120fd Bien calculer l'action corriger une espèce (See #8121) adds eebc867 renommage methode (refs #8121) adds 4a57b27 Merge branch 'feature/8121' into 'develop' No new revisions were added by this update. Summary of changes: .../operation/catches/species/SpeciesBatchRowModel.java | 17 +++++++++++++++++ .../catches/species/SpeciesBatchUIHandler.java | 8 +++++++- 2 files changed, 24 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8121 updated (20120fd -> eebc867)
by codelutin.com scm March 14, 2016

March 14, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8121 in repository tutti. See http://git.codelutin.com/tutti.git from 20120fd Bien calculer l'action corriger une espèce (See #8121) adds eebc867 renommage methode (refs #8121) No new revisions were added by this update. Summary of changes: .../swing/content/operation/catches/species/SpeciesBatchRowModel.java | 4 ++-- .../content/operation/catches/species/SpeciesBatchUIHandler.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (59d368b -> ea5bb50)
by codelutin.com scm March 14, 2016

March 14, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 59d368b Fixes #8056 Merge branch 'feature/8056' into develop new ea5bb50 on cherche la classe de taille dans les observations individuelles en plus des mensurations (au cas où il n'y ait pas de mensurations) 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 ea5bb503c3260d314f95279414e3eb4256765053 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Mar 14 17:20:40 2016 +0100 on cherche la classe de taille dans les observations individuelles en plus des mensurations (au cas où il n'y ait pas de mensurations) Summary of changes: .../frequency/SpeciesFrequencyUIHandler.java | 29 +++++++++++++--------- 1 file changed, 17 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8121 created (now 20120fd)
by codelutin.com scm March 14, 2016

March 14, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8121 in repository tutti. See http://git.codelutin.com/tutti.git at 20120fd Bien calculer l'action corriger une espèce (See #8121) This branch includes the following new commits: new 20120fd Bien calculer l'action corriger une espèce (See #8121) 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 20120fd9b4d69cd70a1e9451d84184070e253551 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Mar 14 17:15:24 2016 +0100 Bien calculer l'action corriger une espèce (See #8121) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8117 created (now 4c8e90b)
by codelutin.com scm March 14, 2016

March 14, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8117 in repository tutti. See http://git.codelutin.com/tutti.git at 4c8e90b mettre l'axe des y du graph poids moyens en gramme et préciser l'unité sur l'axe des x (fixes #8117) This branch includes the following new commits: new 4c8e90b mettre l'axe des y du graph poids moyens en gramme et préciser l'unité sur l'axe des x (fixes #8117) 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 4c8e90b43964e0a2935d0def7a29ffd656a2b92c Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Mar 14 17:07:20 2016 +0100 mettre l'axe des y du graph poids moyens en gramme et préciser l'unité sur l'axe des x (fixes #8117) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8107 created (now ff3e33e)
by codelutin.com scm March 14, 2016

March 14, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8107 in repository tutti. See http://git.codelutin.com/tutti.git at ff3e33e on ne prend pas en compte les caractéristiques par défaut pour chcker si une ligne est vide (fixes #8125) This branch includes the following new commits: new ff3e33e on ne prend pas en compte les caractéristiques par défaut pour chcker si une ligne est vide (fixes #8125) 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 ff3e33e33b3c4287004293bb0ef7715a516a9df5 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Mar 14 16:27:58 2016 +0100 on ne prend pas en compte les caractéristiques par défaut pour chcker si une ligne est vide (fixes #8125) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1